Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 15:46:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added option to cancel snooze on moving messages

Browse Source
This commit is contained in:
M66B
2022-12-16 16:13:44 +01:00
parent e972d32d82
commit 3d7ae5e2e6
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@@ -210,6 +210,7 @@ public class EntityOperation {
boolean autoread = prefs.getBoolean("autoread", false);
boolean autounflag = prefs.getBoolean("autounflag", false);
boolean reset_importance = prefs.getBoolean("reset_importance", false);
boolean reset_snooze = prefs.getBoolean("reset_snooze", false);
if (jargs.opt(1) != null) {
// rules, classify
@@ -313,7 +314,8 @@ public class EntityOperation {
}
if (message.ui_snoozed != null &&
(EntityFolder.ARCHIVE.equals(target.type) ||
(reset_snooze ||
EntityFolder.ARCHIVE.equals(target.type) ||
EntityFolder.TRASH.equals(target.type) ||
EntityFolder.JUNK.equals(target.type))) {
message.ui_snoozed = null;

13
app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
View File

@@ -98,6 +98,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
private SwitchCompat swAutoUnflag;
private SwitchCompat swAutoImportant;
private SwitchCompat swResetImportance;
private SwitchCompat swResetSnooze;
private SwitchCompat swSwipeReply;
final static int MAX_SWIPE_SENSITIVITY = 10;
@@ -111,7 +112,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
"autoexpand", "expand_first", "expand_all", "expand_one", "collapse_multiple",
"autoclose", "onclose", "autoclose_unseen", "collapse_marked",
"undo_timeout",
"autoread", "flag_snoozed", "autounflag", "auto_important", "reset_importance",
"autoread", "flag_snoozed", "autounflag", "auto_important", "reset_importance", "reset_snooze",
"swipe_reply"
};
@@ -165,6 +166,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
swAutoUnflag = view.findViewById(R.id.swAutoUnflag);
swAutoImportant = view.findViewById(R.id.swAutoImportant);
swResetImportance = view.findViewById(R.id.swResetImportance);
swResetSnooze = view.findViewById(R.id.swResetSnooze);
swSwipeReply = view.findViewById(R.id.swSwipeReply);
setOptions();
@@ -496,6 +498,14 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
}
});
swResetSnooze.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("reset_snooze", checked).apply();
}
});
swSwipeReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -614,6 +624,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
swAutoUnflag.setChecked(prefs.getBoolean("autounflag", false));
swAutoImportant.setChecked(prefs.getBoolean("auto_important", false));
swResetImportance.setChecked(prefs.getBoolean("reset_importance", false));
swResetSnooze.setChecked(prefs.getBoolean("reset_snooze", false));
swSwipeReply.setChecked(prefs.getBoolean("swipe_reply", false));
}