1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 08:23:24 +00:00

Disable filtering on not detecting language

This commit is contained in:
M66B 2020-03-27 12:08:49 +01:00
parent 736ac7c79d
commit af0e83d03b
2 changed files with 7 additions and 2 deletions

View file

@ -3354,6 +3354,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
boolean filter_unknown = prefs.getBoolean("filter_unknown", false);
boolean filter_snoozed = prefs.getBoolean("filter_snoozed", true);
boolean filter_duplicates = prefs.getBoolean("filter_duplicates", true);
boolean language_detection = prefs.getBoolean("language_detection", false);
boolean compact = prefs.getBoolean("compact", false);
boolean quick_filter = prefs.getBoolean("quick_filter", false);
@ -3428,7 +3429,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
boolean list = (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER);
menu.findItem(R.id.menu_select_language).setVisible(list && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q);
menu.findItem(R.id.menu_select_language).setVisible(
language_detection && list && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q);
menu.findItem(R.id.menu_select_all).setVisible(!outbox && list);
menu.findItem(R.id.menu_select_found).setVisible(viewType == AdapterMessage.ViewType.SEARCH);
menu.findItem(R.id.menu_empty_trash).setVisible(EntityFolder.TRASH.equals(type) && list);

View file

@ -362,10 +362,13 @@ public class ViewModelMessages extends ViewModel {
this.filter_unflagged = prefs.getBoolean("filter_unflagged", false);
this.filter_unknown = prefs.getBoolean("filter_unknown", false);
this.filter_snoozed = prefs.getBoolean("filter_snoozed", true);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
boolean language_detection = prefs.getBoolean("language_detection", false);
if (!language_detection || Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
this.filter_language = null;
else
this.filter_language = prefs.getString("filter_language", null);
this.debug = prefs.getBoolean("debug", false);
}