mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small improvements

This commit is contained in:
M66B 2020-03-27 13:26:15 +01:00
parent 538525440c
commit 21bb3af518
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/ActivityWidget.java
View File

@ -109,6 +109,9 @@ public class ActivityWidget extends ActivityBase {
@Override
protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
if (accounts == null)
accounts = new ArrayList<>();
EntityAccount all = new EntityAccount();
all.id = -1L;
all.name = getString(R.string.title_widget_account_all);

5
app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
View File

@ -139,13 +139,16 @@ public class ActivityWidgetUnified extends ActivityBase {
DB db = DB.getInstance(context);
List<TupleFolderEx> folders = db.folder().getFoldersEx(account);
if (folders.size() > 0)
if (folders != null && folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context));
return folders;
}
@Override
protected void onExecuted(Bundle args, List<TupleFolderEx> folders) {
if (folders == null)
folders = new ArrayList<>();
TupleFolderEx unified = new TupleFolderEx();
unified.id = -1L;
unified.name = getString(R.string.title_widget_folder_unified);