Added filter on deleted messages

This commit is contained in:
M66B
2021-12-26 21:37:54 +01:00
parent 332e0d7c9b
commit 4e295f318b
5 changed files with 25 additions and 4 deletions

View File

@@ -128,6 +128,7 @@ public class ViewModelMessages extends ViewModel {
args.filter_unflagged,
args.filter_unknown,
args.filter_snoozed,
args.filter_deleted,
args.filter_language,
false,
args.debug),
@@ -149,6 +150,7 @@ public class ViewModelMessages extends ViewModel {
args.filter_unflagged,
args.filter_unknown,
args.filter_snoozed,
args.filter_deleted,
args.filter_language,
false,
args.debug),
@@ -182,7 +184,7 @@ public class ViewModelMessages extends ViewModel {
null,
args.threading,
"time", false,
false, false, false, false,
false, false, false, false, false,
null,
true,
args.debug),
@@ -192,7 +194,7 @@ public class ViewModelMessages extends ViewModel {
db.message().pagedFolder(
args.folder, args.threading,
"time", false,
false, false, false, false,
false, false, false, false, false,
null,
true,
args.debug),
@@ -483,6 +485,7 @@ public class ViewModelMessages extends ViewModel {
private boolean filter_unknown;
private boolean filter_snoozed;
private boolean filter_archive;
private boolean filter_deleted;
private String filter_language;
private boolean debug;
@@ -510,6 +513,7 @@ public class ViewModelMessages extends ViewModel {
this.filter_unflagged = prefs.getBoolean(FragmentMessages.getFilter(context, "unflagged", viewType, type), false);
this.filter_unknown = prefs.getBoolean(FragmentMessages.getFilter(context, "unknown", viewType, type), false);
this.filter_snoozed = prefs.getBoolean(FragmentMessages.getFilter(context, "snoozed", viewType, type), true);
this.filter_deleted = prefs.getBoolean(FragmentMessages.getFilter(context, "deleted", viewType, type), false);
boolean language_detection = prefs.getBoolean("language_detection", false);
String filter_language = prefs.getString("filter_language", null);
@@ -538,6 +542,7 @@ public class ViewModelMessages extends ViewModel {
this.filter_unknown == other.filter_unknown &&
this.filter_snoozed == other.filter_snoozed &&
this.filter_archive == other.filter_archive &&
this.filter_deleted == other.filter_deleted &&
Objects.equals(this.filter_language, other.filter_language) &&
this.debug == other.debug);
} else