msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Rule fixes/improvements

Browse Source
pull/156/head
M66B 6 years ago
parent 7c4c9119ef
commit c74f32f1e7
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save