mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-31 20:25:38 +00:00
Show foreign languages
This commit is contained in:
parent
805eb3951d
commit
c67af92dd3
1 changed files with 15 additions and 6 deletions
|
@ -50,6 +50,7 @@ import android.graphics.drawable.Drawable;
|
|||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.LocaleList;
|
||||
import android.provider.CalendarContract;
|
||||
import android.provider.ContactsContract;
|
||||
import android.provider.Settings;
|
||||
|
@ -259,6 +260,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
private boolean collapse_quotes;
|
||||
private boolean authentication;
|
||||
private boolean language_detection;
|
||||
private List<String> languages;
|
||||
private static boolean debug;
|
||||
|
||||
private boolean gotoTop = false;
|
||||
|
@ -1815,12 +1817,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
.append(message.total == null ? "-" : Helper.humanReadableByteCount(message.total));
|
||||
tvSizeEx.setText(size.toString());
|
||||
|
||||
tvLanguageTitle.setVisibility(
|
||||
show_addresses && language_detection && message.language != null
|
||||
? View.VISIBLE : View.GONE);
|
||||
tvLanguage.setVisibility(
|
||||
show_addresses && language_detection && message.language != null
|
||||
? View.VISIBLE : View.GONE);
|
||||
boolean showLanguage = (language_detection && message.language != null &&
|
||||
(show_addresses ||
|
||||
(languages != null && !languages.contains(message.language))));
|
||||
tvLanguageTitle.setVisibility(showLanguage ? View.VISIBLE : View.GONE);
|
||||
tvLanguage.setVisibility(showLanguage ? View.VISIBLE : View.GONE);
|
||||
tvLanguage.setText(message.language == null ? null : new Locale(message.language).getDisplayLanguage());
|
||||
|
||||
tvSubjectEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
|
||||
|
@ -5335,6 +5336,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
this.authentication = prefs.getBoolean("authentication", true);
|
||||
this.language_detection = prefs.getBoolean("language_detection", false);
|
||||
|
||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
|
||||
languages = new ArrayList<>();
|
||||
LocaleList ll = context.getResources().getConfiguration().getLocales();
|
||||
for (int i = 0; i < ll.size(); i++)
|
||||
languages.add(ll.get(i).getLanguage());
|
||||
} else
|
||||
languages = null;
|
||||
|
||||
debug = prefs.getBoolean("debug", false);
|
||||
|
||||
DiffUtil.ItemCallback<TupleMessageEx> callback = new DiffUtil.ItemCallback<TupleMessageEx>() {
|
||||
|
|
Loading…
Reference in a new issue