Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 22:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Skip copying identity and folder of rules copied to another account

Browse Source
This commit is contained in:
M66B
2023-03-31 17:56:29 +02:00
parent 9c29824738
commit 2185596c3d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1255,8 +1255,10 @@ public class FragmentRule extends FragmentBase {
case EntityRule.TYPE_MOVE:
case EntityRule.TYPE_COPY:
long target = jaction.optLong("target", -1);
showFolder(target);
if (copy < 0 || rule.account == account) {
long target = jaction.optLong("target", -1);
showFolder(target);
}
if (type == EntityRule.TYPE_MOVE) {
etMoveCreate.setText(jaction.optString("create"));
cbMoveSeen.setChecked(jaction.optBoolean("seen"));
@@ -1265,12 +1267,14 @@ public class FragmentRule extends FragmentBase {
break;
case EntityRule.TYPE_ANSWER:
long identity = jaction.optLong("identity", -1);
for (int pos = 0; pos < adapterIdentity.getCount(); pos++)
if (adapterIdentity.getItem(pos).id.equals(identity)) {
spIdent.setSelection(pos);
break;
}
if (copy < 0 || rule.account == account) {
long identity = jaction.optLong("identity", -1);
for (int pos = 0; pos < adapterIdentity.getCount(); pos++)
if (adapterIdentity.getItem(pos).id.equals(identity)) {
spIdent.setSelection(pos);
break;
}
}
long answer = jaction.optLong("answer", -1);
for (int pos = 1; pos < adapterAnswer.getCount(); pos++)