UNC: added option for ignoring quiet hours during interactive mode

C3C0 · C3C0 · commit 9f4859deb77c · 2018-06-10T12:32:59.000+02:00
Now it is possible to choose whether notifications that normally make
noise during quiet hours due to their ignoring rules should be muted
during quiet hours interactive mode (user currently present and
interacting with the device). Defaults to standard behavior which is
that notifications matching ignoring rules make noise also during
interactive mode.

Based on suggestion in #1842
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
@@ -2028,4 +2028,9 @@
     <!-- BatteryBar: only while charging -->
     <string name="pref_battery_bar_show_charging_title">Jen během nabíjení</string>
 
+    <!-- UNC: ignore QH durine ginteractive mode -->
+    <string name="pref_lc_qh_ignore_interactive_title">Pro interaktivní režim</string>
+    <string name="pref_lc_qh_ignore_interactive_summary">Pokud povoleno, notifikace odpovídající pravidlům ignorování tichých hodin
+        nebudou utlumeny během interaktivního režimu</string>
+
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
@@ -2033,4 +2033,9 @@
     <!-- BatteryBar: only while charging -->
     <string name="pref_battery_bar_show_charging_title">Len počas nabíjania</string>
 
+    <!-- UNC: ignore QH durine ginteractive mode -->
+    <string name="pref_lc_qh_ignore_interactive_title">Pre interaktívny režim</string>
+    <string name="pref_lc_qh_ignore_interactive_summary">Ak povolené, notifikácie zodpovedajúce pravidlám ignorovania tichých hodín
+        nebudú utlmené počas interaktívneho režimu</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -2104,4 +2104,9 @@
     <string name="search_keyword_short">Keyword is too short</string>
     <string name="search_no_match">No preferences found</string>
 
+    <!-- UNC: ignore QH durine ginteractive mode -->
+    <string name="pref_lc_qh_ignore_interactive_title">For interactive mode</string>
+    <string name="pref_lc_qh_ignore_interactive_summary">When enabled, notifications matching ignoring rules
+        won\'t be muted by quiet hours interactive mode</string>
+
 </resources>
diff --git a/res/xml/led_control_settings.xml b/res/xml/led_control_settings.xml
@@ -207,6 +207,14 @@
             android:defaultValue=""
             android:dependency="pref_lc_qh_ignore" />
 
+        <CheckBoxPreference
+            android:key="pref_lc_qh_ignore_interactive"
+            android:title="@string/pref_lc_qh_ignore_interactive_title"
+            android:summary="@string/pref_lc_qh_ignore_interactive_summary"
+            android:defaultValue="true"
+            android:persistent="false"
+            android:dependency="pref_lc_qh_ignore" />
+
     </PreferenceCategory>
 
     <PreferenceCategory 
diff --git a/src/com/ceco/oreo/gravitybox/ledcontrol/LedSettings.java b/src/com/ceco/oreo/gravitybox/ledcontrol/LedSettings.java
@@ -80,6 +80,7 @@ public enum VisibilityLs { DEFAULT, CLEARABLE, PERSISTENT, ALL };
     private LedMode mLedMode;
     private boolean mQhIgnore;
     private String mQhIgnoreList;
+    private boolean mQhIgnoreInteractive;
     private HeadsUpMode mHeadsUpMode;
     private boolean mHeadsUpDnd;
     private int mHeadsUpTimeout;
@@ -162,6 +163,8 @@ private static LedSettings deserialize(Context context, String packageName, Set<
                 ls.setQhIgnore(Boolean.valueOf(data[1]));
             } else if (data[0].equals("qhIgnoreList")) {
                 ls.setQhIgnoreList(data[1]);
+            } else if (data[0].equals("qhIgnoreInteractive")) {
+                ls.setQhIgnoreInteractive(Boolean.valueOf(data[1]));
             } else if (data[0].equals("headsUpMode")) {
                 ls.setHeadsUpMode(data[1]);
             } else if (data[0].equals("headsUpDnd")) {
@@ -214,6 +217,7 @@ private LedSettings(Context context, String packageName) {
         mLedMode = LedMode.OVERRIDE;
         mQhIgnore = false;
         mQhIgnoreList = null;
+        mQhIgnoreInteractive = true;
         mHeadsUpMode = HeadsUpMode.DEFAULT;
         mHeadsUpDnd = false;
         mHeadsUpTimeout = 5;
@@ -412,6 +416,10 @@ protected void setQhIgnoreList(String ignoreList) {
         mQhIgnoreList = ignoreList;
     }
 
+    protected void setQhIgnoreInteractive (boolean ignore) {
+        mQhIgnoreInteractive = ignore;
+    }
+
     protected void setHeadsUpMode(HeadsUpMode mode) {
         mHeadsUpMode = mode;
     }
@@ -560,6 +568,10 @@ public String getQhIgnoreList() {
         return mQhIgnoreList;
     }
 
+    public boolean getQhIgnoreInteractive() {
+        return mQhIgnoreInteractive;
+    }
+
     public HeadsUpMode getHeadsUpMode() {
         return mHeadsUpMode;
     }
@@ -626,6 +638,7 @@ private Set<String> createDataSet() {
         if (mQhIgnoreList != null) {
             dataSet.add("qhIgnoreList:" + mQhIgnoreList);
         }
+        dataSet.add("qhIgnoreInteractive:" + mQhIgnoreInteractive);
         dataSet.add("headsUpMode:" + mHeadsUpMode.toString());
         dataSet.add("headsUpDnd:" + mHeadsUpDnd);
         dataSet.add("headsUpTimeout:" + mHeadsUpTimeout);
diff --git a/src/com/ceco/oreo/gravitybox/ledcontrol/LedSettingsActivity.java b/src/com/ceco/oreo/gravitybox/ledcontrol/LedSettingsActivity.java
@@ -140,6 +140,7 @@ private void applyPrefsToSettings(LedSettings settings) {
         settings.setLedMode(mPrefsFragment.getLedMode());
         settings.setQhIgnore(mPrefsFragment.getQhIgnore());
         settings.setQhIgnoreList(mPrefsFragment.getQhIgnoreList());
+        settings.setQhIgnoreInteractive(mPrefsFragment.getQhIgnoreInteractive());
         settings.setHeadsUpMode(mPrefsFragment.getHeadsUpMode());
         settings.setHeadsUpDnd(mPrefsFragment.getHeadsUpDnd());
         settings.setHeadsUpTimeout(mPrefsFragment.getHeadsUpTimeout());
diff --git a/src/com/ceco/oreo/gravitybox/ledcontrol/LedSettingsFragment.java b/src/com/ceco/oreo/gravitybox/ledcontrol/LedSettingsFragment.java
@@ -71,6 +71,7 @@ public class LedSettingsFragment extends PreferenceFragment implements OnPrefere
     private static final String PREF_CAT_KEY_QH = "pref_cat_lc_quiet_hours";
     private static final String PREF_KEY_QH_IGNORE = "pref_lc_qh_ignore";
     private static final String PREF_KEY_QH_IGNORE_LIST = "pref_lc_qh_ignore_list";
+    private static final String PREF_KEY_QH_IGNORE_INTERACTIVE = "pref_lc_qh_ignore_interactive";
     private static final String PREF_CAT_KEY_HEADS_UP = "pref_cat_lc_heads_up";
     private static final String PREF_KEY_HEADS_UP_MODE = "pref_lc_headsup_mode";
     private static final String PREF_KEY_HEADS_UP_DND = "pref_lc_headsup_dnd";
@@ -108,6 +109,7 @@ public class LedSettingsFragment extends PreferenceFragment implements OnPrefere
     private PreferenceCategory mQhCat;
     private CheckBoxPreference mQhIgnorePref;
     private EditTextPreference mQhIgnoreListPref;
+    private CheckBoxPreference mQhIgnoreInteractivePref;
     private PreferenceCategory mHeadsUpCat;
     private ListPreference mHeadsUpModePref;
     private CheckBoxPreference mHeadsUpDndPref;
@@ -153,6 +155,7 @@ public void onCreate(Bundle savedInstanceState) {
         mQhCat = (PreferenceCategory) findPreference(PREF_CAT_KEY_QH);
         mQhIgnorePref = (CheckBoxPreference) findPreference(PREF_KEY_QH_IGNORE);
         mQhIgnoreListPref = (EditTextPreference) findPreference(PREF_KEY_QH_IGNORE_LIST);
+        mQhIgnoreInteractivePref = (CheckBoxPreference) findPreference(PREF_KEY_QH_IGNORE_INTERACTIVE);
         mHeadsUpCat = (PreferenceCategory) findPreference(PREF_CAT_KEY_HEADS_UP);
         mHeadsUpModePref = (ListPreference) findPreference(PREF_KEY_HEADS_UP_MODE);
         mHeadsUpModePref.setOnPreferenceChangeListener(this);
@@ -208,6 +211,7 @@ protected void initialize(LedSettings ledSettings) {
         } else {
             mQhIgnorePref.setChecked(ledSettings.getQhIgnore());
             mQhIgnoreListPref.setText(ledSettings.getQhIgnoreList());
+            mQhIgnoreInteractivePref.setChecked(ledSettings.getQhIgnoreInteractive());
         }
         if (!LedSettings.isHeadsUpEnabled(getActivity())) {
             getPreferenceScreen().removePreference(mHeadsUpCat);
@@ -331,6 +335,10 @@ protected String getQhIgnoreList() {
         return mQhIgnoreListPref.getText();
     }
 
+    protected boolean getQhIgnoreInteractive() {
+        return mQhIgnoreInteractivePref.isChecked();
+    }
+
     protected String getHeadsUpMode() {
         return mHeadsUpModePref.getValue();
     }
diff --git a/src/com/ceco/oreo/gravitybox/ledcontrol/QuietHours.java b/src/com/ceco/oreo/gravitybox/ledcontrol/QuietHours.java
@@ -105,9 +105,10 @@ public boolean quietHoursActive(LedSettings ls, Notification n, boolean userPres
         }
 
         if (ls.getEnabled() && ls.getQhIgnore()) {
+            boolean defaultIgnoreResult = (interactive && userPresent) ? !ls.getQhIgnoreInteractive() : false;
             if (ls.getQhIgnoreList() == null || ls.getQhIgnoreList().trim().isEmpty()) {
                 if (ModLedControl.DEBUG) ModLedControl.log("QH ignored for all notifications");
-                return false;
+                return defaultIgnoreResult;
             } else {
                 List<CharSequence> notifTexts = getNotificationTexts(n);
                 String[] keywords = ls.getQhIgnoreList().trim().split(",");
@@ -121,7 +122,7 @@ public boolean quietHoursActive(LedSettings ls, Notification n, boolean userPres
                     }
                 }
                 if (ModLedControl.DEBUG) ModLedControl.log("QH ignore list contains keyword?: " + ignore);
-                return (ignore ? false : (quietHoursActive() || (interactive && userPresent)));
+                return (ignore ? defaultIgnoreResult : (quietHoursActive() || (interactive && userPresent)));
             }
         } else {
             return (quietHoursActive() || (interactive && userPresent));

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,10 @@ public boolean quietHoursActive(LedSettings ls, Notification n, boolean userPres`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`if (ls.getEnabled() && ls.getQhIgnore()) {`
	`108`	`+ boolean defaultIgnoreResult = (interactive && userPresent) ? !ls.getQhIgnoreInteractive() : false;`
`108`	`109`	`if (ls.getQhIgnoreList() == null \|\| ls.getQhIgnoreList().trim().isEmpty()) {`
`109`	`110`	`if (ModLedControl.DEBUG) ModLedControl.log("QH ignored for all notifications");`
`110`		`- return false;`
	`111`	`+ return defaultIgnoreResult;`
`111`	`112`	`} else {`
`112`	`113`	`List<CharSequence> notifTexts = getNotificationTexts(n);`
`113`	`114`	`String[] keywords = ls.getQhIgnoreList().trim().split(",");`
`@@ -121,7 +122,7 @@ public boolean quietHoursActive(LedSettings ls, Notification n, boolean userPres`
`121`	`122`	`}`
`122`	`123`	`}`
`123`	`124`	`if (ModLedControl.DEBUG) ModLedControl.log("QH ignore list contains keyword?: " + ignore);`
`124`		`- return (ignore ? false : (quietHoursActive() \|\| (interactive && userPresent)));`
	`125`	`+ return (ignore ? defaultIgnoreResult : (quietHoursActive() \|\| (interactive && userPresent)));`
`125`	`126`	`}`
`126`	`127`	`} else {`
`127`	`128`	`return (quietHoursActive() \|\| (interactive && userPresent));`