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

Added reply CC rule parameter

Browse Source
This commit is contained in:
M66B
2019-02-18 09:19:12 +00:00
parent 9b7d108ccc
commit f3aaeca24c
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -194,6 +194,7 @@ public class EntityRule {
private void onActionAnswer(Context context, DB db, EntityMessage message, JSONObject jargs) throws JSONException, IOException {
long iid = jargs.getLong("identity");
long aid = jargs.getLong("answer");
boolean cc = (jargs.has("cc") && jargs.getBoolean("cc"));
EntityIdentity identity = db.identity().getIdentity(iid);
if (identity == null)
@@ -213,6 +214,8 @@ public class EntityRule {
reply.thread = message.thread;
reply.to = (message.reply == null || message.reply.length == 0 ? message.from : message.reply);
reply.from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)};
if (cc)
reply.cc = message.cc;
reply.subject = context.getString(R.string.title_subject_reply, message.subject == null ? "" : message.subject);
reply.sender = MessageHelper.getSortKey(reply.from);
reply.received = new Date().getTime();

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

@@ -78,6 +78,7 @@ public class FragmentRule extends FragmentBase {
private Spinner spTarget;
private Spinner spIdent;
private Spinner spAnswer;
private CheckBox cbCc;
private BottomNavigationView bottom_navigation;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
@@ -128,6 +129,7 @@ public class FragmentRule extends FragmentBase {
spTarget = view.findViewById(R.id.spTarget);
spIdent = view.findViewById(R.id.spIdent);
spAnswer = view.findViewById(R.id.spAnswer);
cbCc = view.findViewById(R.id.cbCc);
bottom_navigation = view.findViewById(R.id.bottom_navigation);
pbWait = view.findViewById(R.id.pbWait);
grpReady = view.findViewById(R.id.grpReady);
@@ -378,6 +380,9 @@ public class FragmentRule extends FragmentBase {
spAnswer.setSelection(pos);
break;
}
boolean cc = (jaction.has("cc") && jaction.getBoolean("cc"));
cbCc.setChecked(cc);
break;
}
@@ -601,8 +606,10 @@ public class FragmentRule extends FragmentBase {
case EntityRule.TYPE_ANSWER:
EntityIdentity identity = (EntityIdentity) spIdent.getSelectedItem();
EntityAnswer answer = (EntityAnswer) spAnswer.getSelectedItem();
boolean cc = cbCc.isChecked();
jaction.put("identity", identity.id);
jaction.put("answer", answer.id);
jaction.put("cc", cc);
break;
}
}