mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 01:06:04 +00:00
Code Issues Releases Wiki Activity

Always set filter archive flag

Browse source
This commit is contained in:
M66B 2020-04-03 09:39:48 +02:00
parent ee80a62455
commit 0a91291eaf
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/Core.java
View file

@ -3074,6 +3074,7 @@ class Core {
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account);
thread.putExtra("id", message.id);
thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(message.folderType));
piContent = PendingIntent.getActivity(context, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT);
}

6
app/src/main/java/eu/faircode/email/ServiceUI.java
View file

@ -374,6 +374,7 @@ public class ServiceUI extends IntentService {
private void onIgnore(long id, boolean open) {
EntityMessage message;
EntityFolder folder;
DB db = DB.getInstance(this);
try {
@ -383,6 +384,10 @@ public class ServiceUI extends IntentService {
if (message == null)
return;
folder = db.folder().getFolder(message.folder);
if (folder == null)
return;
db.message().setMessageUiIgnored(message.id, true);
db.setTransactionSuccessful();
@ -396,6 +401,7 @@ public class ServiceUI extends IntentService {
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account);
thread.putExtra("id", message.id);
thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(folder.type));
startActivity(thread);
}
}

1
app/src/main/java/eu/faircode/email/WidgetUnified.java
View file

@ -71,6 +71,7 @@ public class WidgetUnified extends AppWidgetProvider {
Intent thread = new Intent(context, ActivityView.class);
thread.setAction("widget");
thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(type));
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piItem = PendingIntent.getActivity(
context, ActivityView.REQUEST_WIDGET, thread, PendingIntent.FLAG_UPDATE_CURRENT);