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

Show permanent delete max

This commit is contained in:
M66B 2021-05-07 21:40:14 +02:00
parent 8152c1d557
commit cdc0cba3f2
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,8 @@ import android.provider.Settings;
import android.security.KeyChain; import android.security.KeyChain;
import android.security.KeyChainException; import android.security.KeyChainException;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
@ -2912,9 +2914,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
.setIcon(R.drawable.twotone_delete_24); .setIcon(R.drawable.twotone_delete_24);
if (result.isTrash || !result.hasTrash || result.isJunk || if (result.isTrash || !result.hasTrash || result.isJunk ||
ids.length <= MAX_PERMANENT_DELETE) // is trash or no trash or is junk ids.length <= MAX_PERMANENT_DELETE || true) { // is trash or no trash or is junk
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete_permanently, order++, R.string.title_delete_permanently) SpannableStringBuilder del = new SpannableStringBuilder();
.setIcon(R.drawable.twotone_delete_forever_24); del.append(getString(R.string.title_delete_permanently));
int pos = del.length();
del.append(" (").append(NF.format(MAX_PERMANENT_DELETE)).append("-)");
del.setSpan(new RelativeSizeSpan(0.7f), pos, del.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete_permanently, order++, del)
.setIcon(R.drawable.twotone_delete_forever_24)
.setEnabled(ids.length <= MAX_PERMANENT_DELETE);
}
if (result.accounts.size() > 0 /* IMAP */ && ids.length < MAX_SEND_RAW) if (result.accounts.size() > 0 /* IMAP */ && ids.length < MAX_SEND_RAW)
popupMenu.getMenu().add(Menu.NONE, R.string.title_raw_send, order++, R.string.title_raw_send) popupMenu.getMenu().add(Menu.NONE, R.string.title_raw_send, order++, R.string.title_raw_send)