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

Fixes, improvements

Browse Source
This commit is contained in:
M66B
2018-08-12 15:31:43 +00:00
parent a46874130f
commit 633482ade7
17 changed files with 235 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,11 @@ public class FragmentMessages extends FragmentEx {
messages.observe(getViewLifecycleOwner(), new Observer<PagedList<TupleMessageEx>>() {
@Override
public void onChanged(@Nullable PagedList<TupleMessageEx> messages) {
if (messages == null) {
getFragmentManager().popBackStack();
return;
}
Log.i(Helper.TAG, "Submit messages=" + messages.size());
adapter.submitList(messages);
@@ -161,17 +166,19 @@ public class FragmentMessages extends FragmentEx {
DB db = DB.getInstance(context);
Long account;
if (thread < 0)
if (folder < 0)
return db.folder().getPrimaryDrafts().account;
else
Long account = null;
if (thread < 0) {
if (folder >= 0)
account = db.folder().getFolder(folder).account;
else
} else
account = db.message().getMessage(thread).account;
if (account == null) // outbox
account = db.folder().getPrimaryDrafts().account;
if (account == null) {
// outbox
EntityFolder primary = db.folder().getPrimaryDrafts();
if (primary != null)
account = primary.account;
}
return account;
}