mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-19 13:48:58 +00:00
Code Issues Releases Wiki Activity

Allow opening unified inbox from unified folders dialog

Browse source
This commit is contained in:
M66B 2023-10-22 17:02:52 +02:00
parent b22a6d5b65
commit 4b12584e46
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/eu/faircode/email/FragmentDialogSelectUnifiedFolder.java
View file

@ -90,15 +90,27 @@ public class FragmentDialogSelectUnifiedFolder extends FragmentDialogBase {
else if (folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context));
TupleFolderEx unified = new TupleFolderEx();
unified.id = -1L;
unified.name = context.getString(R.string.title_folder_unified);
folders.add(0, unified);
AdapterFolder adapter = new AdapterFolder(context, folders, new AdapterFolder.IListener() {
@Override
public void onSelected(TupleFolderEx folder) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", folder.account)
.putExtra("folder", folder.id)
.putExtra("type", folder.type));
if (folder.id < 0)
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("type", (String) null)
.putExtra("unified", true));
else
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", folder.account)
.putExtra("folder", folder.id)
.putExtra("type", folder.type));
sendResult(RESULT_OK);
dialog.dismiss();
}
@ -148,7 +160,10 @@ public class FragmentDialogSelectUnifiedFolder extends FragmentDialogBase {
tv.setPadding(0, vpad, 0, vpad);
vwColor.setBackgroundColor(folder.color == null ? Color.TRANSPARENT : folder.color);
tv.setText(folder.accountName + "/" + folder.getDisplayName(context));
if (folder.accountName == null)
tv.setText(folder.getDisplayName(context));
else
tv.setText(folder.accountName + "/" + folder.getDisplayName(context));
}
@Override