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

Fixed junk button

This commit is contained in:
M66B 2020-01-12 11:50:53 +01:00
parent 2177b047e5
commit 84dcae03e8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1160,9 +1160,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setVisibility(View.VISIBLE);
ibImages.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
ibJunk.setEnabled(false);
ibJunk.setVisibility(
message.uid == null || message.folderReadOnly ||
!hasJunk || EntityFolder.JUNK.equals(message.folderType)
EntityFolder.JUNK.equals(message.folderType)
? View.GONE : View.VISIBLE);
ibDecrypt.setVisibility(View.GONE);
ibVerify.setVisibility(View.GONE);
@ -1290,6 +1291,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
delete = (inTrash || !hasTrash || inOutbox);
ibJunk.setEnabled(hasJunk);
bnvActions.getMenu().findItem(R.id.action_more).setVisible(!inOutbox);
if (!message.folderReadOnly) {