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

Added copy rule

Browse Source
This commit is contained in:
M66B
2019-08-20 22:08:38 +02:00
parent 348fd3806d
commit 4f68d86316
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/AdapterRule.java
View File

@@ -185,6 +185,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
.setCheckable(true).setChecked(rule.enabled);
popupMenu.getMenu().add(Menu.NONE, R.string.title_rule_execute, 2, R.string.title_rule_execute)
.setEnabled(ActivityBilling.isPro(context));
popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 3, R.string.title_copy);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
@@ -193,9 +194,15 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
case R.string.title_rule_enabled:
onActionEnabled(!item.isChecked());
return true;
case R.string.title_rule_execute:
onActionExecute();
return true;
case R.string.title_copy:
onActionCopy();
return true;
default:
return false;
}
@@ -278,6 +285,16 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
}
}.execute(context, owner, args, "rule:execute");
}
private void onActionCopy() {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_EDIT_RULE)
.putExtra("id", rule.id)
.putExtra("account", rule.account)
.putExtra("folder", rule.folder)
.putExtra("copy", true));
}
});
popupMenu.show();

9
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@@ -40,7 +40,6 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
@@ -143,6 +142,7 @@ public class FragmentRule extends FragmentBase {
private ArrayAdapter<EntityAnswer> adapterAnswer;
private long id = -1;
private long copy = -1;
private long account = -1;
private long folder = -1;
private int color = Color.TRANSPARENT;
@@ -162,7 +162,10 @@ public class FragmentRule extends FragmentBase {
// Get arguments
Bundle args = getArguments();
id = args.getLong("id", -1);
if (args.getBoolean("copy"))
copy = args.getLong("id", -1);
else
id = args.getLong("id", -1);
account = args.getLong("account", -1);
folder = args.getLong("folder", -1);
}
@@ -591,7 +594,7 @@ public class FragmentRule extends FragmentBase {
private void loadRule() {
Bundle rargs = new Bundle();
rargs.putLong("id", id);
rargs.putLong("id", copy < 0 ? id : copy);
rargs.putString("sender", getArguments().getString("sender"));
rargs.putString("recipient", getArguments().getString("recipient"));
rargs.putString("subject", getArguments().getString("subject"));