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

Revert "Fixed threaded messages actions"

Browse Source 
This reverts commit 2b807d5253.
This commit is contained in:
M66B
2018-09-28 14:01:33 +00:00
parent 2b807d5253
commit 46a467c001
2 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -263,7 +263,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
final TupleMessageEx message = getItem(pos);
PopupMenu popupMenu = new PopupMenu(context, itemView);
if (!message.threaded && !EntityFolder.OUTBOX.equals(message.folderType)) {
if (!EntityFolder.OUTBOX.equals(message.folderType)) {
popupMenu.getMenu().add(Menu.NONE, action_flag, 1, message.ui_flagged ? R.string.title_unflag : R.string.title_flag);
popupMenu.getMenu().add(Menu.NONE, action_seen, 2, message.ui_seen ? R.string.title_unseen : R.string.title_seen);
}

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

@@ -42,7 +42,6 @@ import android.widget.TextView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -242,14 +241,12 @@ public class FragmentMessages extends FragmentEx {
Bundle args = new Bundle();
args.putLong("id", message.id);
args.putInt("direction", direction);
args.putBoolean("single", !message.threaded);
new SimpleTask<String[]>() {
@Override
protected String[] onLoad(Context context, Bundle args) {
long id = args.getLong("id");
int direction = args.getInt("direction");
boolean single = args.getBoolean("single");
EntityFolder target = null;
// Get target folder and hide message
@@ -269,14 +266,7 @@ public class FragmentMessages extends FragmentEx {
target = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
}
List<EntityMessage> messages = new ArrayList<>();
if (single)
messages.add(message);
else
messages.addAll(db.message().getMessageByThread(message.account, message.thread));
for (EntityMessage m : messages)
db.message().setMessageUiHide(m.id, true);
db.message().setMessageUiHide(message.id, true);
db.setTransactionSuccessful();
} finally {
@@ -305,30 +295,8 @@ public class FragmentMessages extends FragmentEx {
@Override
protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id");
boolean single = args.getBoolean("single");
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(id);
List<EntityMessage> messages = new ArrayList<>();
if (single)
messages.add(message);
else
messages.addAll(db.message().getMessageByThread(message.account, message.thread));
for (EntityMessage m : messages) {
Log.i(Helper.TAG, "Undo move id=" + m.id);
DB.getInstance(context).message().setMessageUiHide(m.id, false);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
Log.i(Helper.TAG, "Undo move id=" + id);
DB.getInstance(context).message().setMessageUiHide(id, false);
return null;
}