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

Small improvements

Browse Source
This commit is contained in:
M66B
2018-12-06 15:41:54 +01:00
parent 9fe22c7609
commit f6199ef010
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -1198,10 +1198,12 @@ public class FragmentMessages extends FragmentEx {
db.folder().liveUnified().observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
@Override
public void onChanged(List<TupleFolderEx> folders) {
if (folders == null)
folders = new ArrayList<>();
int unseen = 0;
if (folders != null)
for (TupleFolderEx folder : folders)
unseen += folder.unseen;
for (TupleFolderEx folder : folders)
unseen += folder.unseen;
String name = getString(R.string.title_folder_unified);
if (unseen > 0)
setSubtitle(getString(R.string.title_folder_unseen, name, unseen));
@@ -1275,12 +1277,11 @@ public class FragmentMessages extends FragmentEx {
if (actionbar && viewType == AdapterMessage.ViewType.THREAD) {
boolean hasTrash = false;
boolean hasArchive = false;
if (folders != null)
for (EntityFolder folder : folders)
if (EntityFolder.TRASH.equals(folder.type))
hasTrash = true;
else if (EntityFolder.ARCHIVE.equals(folder.type))
hasArchive = true;
for (EntityFolder folder : folders)
if (EntityFolder.TRASH.equals(folder.type))
hasTrash = true;
else if (EntityFolder.ARCHIVE.equals(folder.type))
hasArchive = true;
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class);
ViewModelMessages.Target[] pn = model.getPrevNext(thread);