Always set filter archive flag

pull/178/head
M66B 5 years ago
parent ee80a62455
commit 0a91291eaf

@ -3074,6 +3074,7 @@ class Core {
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account); thread.putExtra("account", message.account);
thread.putExtra("id", message.id); 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); piContent = PendingIntent.getActivity(context, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT);
} }

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

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

Loading…
Cancel
Save