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

Rule fixes/improvements

This commit is contained in:
M66B 2019-05-22 21:26:02 +02:00
parent 7c4c9119ef
commit c74f32f1e7
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
condition.add(context.getString(R.string.title_rule_subject));
if (jcondition.has("header"))
condition.add(context.getString(R.string.title_rule_header));
tvCondition.setText(TextUtils.join(", ", condition));
tvCondition.setText(TextUtils.join(" & ", condition));
} catch (Throwable ex) {
tvCondition.setText(ex.getMessage());
}
@ -109,16 +109,22 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
int type = jaction.getInt("type");
switch (type) {
case EntityRule.TYPE_SEEN:
tvAction.setText(R.string.title_seen);
tvAction.setText(R.string.title_rule_seen);
break;
case EntityRule.TYPE_UNSEEN:
tvAction.setText(R.string.title_unseen);
tvAction.setText(R.string.title_rule_unseen);
break;
case EntityRule.TYPE_FLAG:
tvAction.setText(R.string.title_rule_flag);
break;
case EntityRule.TYPE_MOVE:
tvAction.setText(R.string.title_move);
tvAction.setText(R.string.title_rule_move);
break;
case EntityRule.TYPE_COPY:
tvAction.setText(R.string.title_rule_copy);
break;
case EntityRule.TYPE_ANSWER:
tvAction.setText(R.string.title_answer_reply);
tvAction.setText(R.string.title_rule_answer);
break;
case EntityRule.TYPE_AUTOMATION:
tvAction.setText(R.string.title_rule_automation);