Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 11:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show number of messages reported as spam, fixed double confirm

Browse Source
This commit is contained in:
M66B
2019-01-27 08:33:58 +00:00
parent efaa964a85
commit f0ed61a9f6
21 changed files with 30 additions and 34 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

@@ -1481,7 +1481,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void onMenuJunk(final ActionData data) {
new DialogBuilderLifecycle(context, owner)
.setMessage(R.string.title_ask_spam)
.setMessage(context.getResources().getQuantityString(R.plurals.title_ask_spam, 1, 1))
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

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

@@ -1187,8 +1187,9 @@ public class FragmentMessages extends FragmentBase {
}
private void onActionJunkSelection() {
int count = selectionTracker.getSelection().size();
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(R.string.title_ask_spam)
.setMessage(getResources().getQuantityString(R.plurals.title_ask_spam, count, count))
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -1199,7 +1200,7 @@ public class FragmentMessages extends FragmentBase {
.show();
}
private void onActionMoveSelection(String type) {
private void onActionMoveSelection(final String type) {
Bundle args = new Bundle();
args.putString("type", type);
args.putLongArray("ids", getSelection());
@@ -1241,7 +1242,10 @@ public class FragmentMessages extends FragmentBase {
@Override
protected void onExecuted(Bundle args, ArrayList<MessageTarget> result) {
moveAsk(result);
if (EntityFolder.JUNK.equals(type))
moveAskConfirmed(result);
else
moveAsk(result);
}
@Override