Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 17:13:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added junk button

Browse Source
This commit is contained in:
M66B
2020-01-04 19:40:41 +01:00
parent 5c3ea59647
commit 6214e75aeb
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,6 +342,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageButton ibFull;
private ImageButton ibImages;
private ImageButton ibUnsubscribe;
private ImageButton ibJunk;
private ImageButton ibVerify;
private ImageButton ibDecrypt;
@@ -519,6 +520,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull = vsBody.findViewById(R.id.ibFull);
ibImages = vsBody.findViewById(R.id.ibImages);
ibUnsubscribe = vsBody.findViewById(R.id.ibUnsubscribe);
ibJunk = vsBody.findViewById(R.id.ibJunk);
ibVerify = vsBody.findViewById(R.id.ibVerify);
ibDecrypt = vsBody.findViewById(R.id.ibDecrypt);
@@ -595,6 +597,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setOnClickListener(this);
ibImages.setOnClickListener(this);
ibUnsubscribe.setOnClickListener(this);
ibJunk.setOnClickListener(this);
ibVerify.setOnClickListener(this);
ibDecrypt.setOnClickListener(this);
@@ -658,6 +661,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setOnClickListener(null);
ibImages.setOnClickListener(null);
ibUnsubscribe.setOnClickListener(null);
ibJunk.setOnClickListener(null);
ibVerify.setOnClickListener(null);
ibDecrypt.setOnClickListener(null);
@@ -1033,6 +1037,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setVisibility(View.GONE);
ibImages.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(View.GONE);
ibJunk.setVisibility(View.GONE);
ibVerify.setVisibility(View.GONE);
ibDecrypt.setVisibility(View.GONE);
@@ -1147,6 +1152,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.setVisibility(
message.uid == null || message.folderReadOnly &&
(hasJunk && !EntityFolder.JUNK.equals(message.folderType))
? View.GONE : View.VISIBLE);
ibDecrypt.setVisibility(View.GONE);
ibVerify.setVisibility(View.GONE);
@@ -2097,6 +2106,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
case R.id.ibUnsubscribe:
onActionUnsubscribe(message);
break;
case R.id.ibJunk:
onActionJunk(message);
break;
case R.id.ibVerify:
case R.id.ibDecrypt:
onActionDecrypt(message, false);
@@ -2766,6 +2778,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onOpenLink(uri, context.getString(R.string.title_legend_show_unsubscribe));
}
private void onActionJunk(TupleMessageEx message) {
onMenuJunk(message);
}
private void onActionDecrypt(TupleMessageEx message, boolean auto) {
int encrypt = (message.encrypt == null ? EntityMessage.PGP_SIGNENCRYPT /* Inline */ : message.encrypt);