Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-05 04:19:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added folder display name

Browse Source
This commit is contained in:
M66B
2018-09-19 17:47:03 +00:00
parent c481754dee
commit 07f6d33efd
14 changed files with 1065 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/FragmentMessage.java
View File

@@ -464,7 +464,10 @@ public class FragmentMessage extends FragmentEx {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState == null) {
setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));
String name = (message.folderDisplay == null
? Helper.localizeFolderName(getContext(), message.folderName)
: message.folderDisplay);
setSubtitle(name);
ivFlagged.setImageResource(message.ui_flagged ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, true));
@@ -565,7 +568,10 @@ public class FragmentMessage extends FragmentEx {
getActivity().invalidateOptionsMenu();
// Messages can be moved to another folder
setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));
String name = (message.folderDisplay == null
? Helper.localizeFolderName(getContext(), message.folderName)
: message.folderDisplay);
setSubtitle(name);
// Observe folders
if (observing)
@@ -832,8 +838,7 @@ public class FragmentMessage extends FragmentEx {
int order = 0;
for (EntityAnswer answer : answers)
popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++,
Helper.localizeFolderName(getContext(), answer.name));
popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++, answer.name);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
@@ -1065,9 +1070,12 @@ public class FragmentMessage extends FragmentEx {
PopupMenu popupMenu = new PopupMenu(getContext(), anchor);
int order = 0;
for (EntityFolder folder : folders)
popupMenu.getMenu().add(Menu.NONE, folder.id.intValue(), order++,
Helper.localizeFolderName(getContext(), folder.name));
for (EntityFolder folder : folders) {
String name = (folder.display == null
? Helper.localizeFolderName(getContext(), folder.name)
: folder.display);
popupMenu.getMenu().add(Menu.NONE, folder.id.intValue(), order++, name);
}
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override