Refactoring

This commit is contained in:
M66B
2021-11-22 08:36:51 +01:00
parent 1abfdb7e06
commit f2daedcf7d
4 changed files with 59 additions and 47 deletions

View File

@@ -105,10 +105,10 @@ public class ViewModelMessages extends ViewModel {
BoundaryCallbackMessages boundary = null;
if (viewType == AdapterMessage.ViewType.FOLDER)
boundary = new BoundaryCallbackMessages(context,
args.account, args.folder, true, args.criteria, REMOTE_PAGE_SIZE);
viewType, args.account, args.folder, true, args.criteria, REMOTE_PAGE_SIZE);
else if (viewType == AdapterMessage.ViewType.SEARCH)
boundary = new BoundaryCallbackMessages(context,
args.account, args.folder, args.server, args.criteria,
viewType, args.account, args.folder, args.server, args.criteria,
args.server ? REMOTE_PAGE_SIZE : SEARCH_PAGE_SIZE);
LivePagedListBuilder<Integer, TupleMessageEx> builder = null;
@@ -503,13 +503,12 @@ public class ViewModelMessages extends ViewModel {
this.server = server;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
this.sort = prefs.getString("sort", "time");
this.ascending = prefs.getBoolean(
viewType == AdapterMessage.ViewType.THREAD ? "ascending_thread" : "ascending_list", false);
this.filter_seen = prefs.getBoolean(FragmentMessages.getFilter("seen", type), false);
this.filter_unflagged = prefs.getBoolean(FragmentMessages.getFilter("unflagged", type), false);
this.filter_unknown = prefs.getBoolean(FragmentMessages.getFilter("unknown", type), false);
this.filter_snoozed = prefs.getBoolean(FragmentMessages.getFilter("snoozed", type), true);
this.sort = prefs.getString(FragmentMessages.getSort(context, viewType, type), "time");
this.ascending = prefs.getBoolean(FragmentMessages.getSortOrder(context, viewType, type), false);
this.filter_seen = prefs.getBoolean(FragmentMessages.getFilter(context, "seen", viewType, type), false);
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);
boolean language_detection = prefs.getBoolean("language_detection", false);
String filter_language = prefs.getString("filter_language", null);