Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 608d3211 authored by Tingting Wang's avatar Tingting Wang
Browse files

Fix bug for exchange account editor.

For exchange account contact, name field is different from the others.
First name and last name are shown instead of one display name field.
So convertion between display name and first/last name need be added.

BUG 25673410

Change-Id: I617a9e356514db9468488e00f75420f09f63da83
parent 3d65ea5f
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -221,8 +221,13 @@ public class StructuredNameEditorView extends TextFieldsEditorView {
     */
    public void setDisplayName(String name) {
        // For now, assume the first text field is the name.
        // TODO: Find a better way to get a hold of the name field.
        // TODO: Find a better way to get a hold of the name field,
        // including given_name and family_name.
        super.setValue(0, name);
        getValues().setDisplayName(name);
        rebuildStructuredName(getValues());
        super.setValue(1, getValues().getAsString(StructuredName.GIVEN_NAME));
        super.setValue(3, getValues().getAsString(StructuredName.FAMILY_NAME));
    }

    /**
@@ -230,6 +235,7 @@ public class StructuredNameEditorView extends TextFieldsEditorView {
     */
    public String getDisplayName() {
        final ValuesDelta valuesDelta = getValues();
        rebuildFullName(valuesDelta);
        if (hasShortAndLongForms() && areOptionalFieldsVisible()) {
            final Map<String, String> structuredNameMap = valuesToStructuredNameMap(valuesDelta);
            final String displayName = NameConverter.structuredNameToDisplayName(