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

Commit 103d5364 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Make vCard importer use Organization name when there's no other information available. 

Some Contacts users are accustomed to use Organization as a name of the contact when the target contact is for some oraginazion like company, etc., so this change makes sense.

Bug: 2310146
parent 51e43a34

core/java/android/pim/vcard/VCardEntry.java

+25 −0
Original line number Diff line number Diff line
@@ -281,6 +281,29 @@ public class VCardEntry { 
                    isPrimary == organization.isPrimary);

        }



        public String getFormattedString() {

            final StringBuilder builder = new StringBuilder();

            if (!TextUtils.isEmpty(companyName)) {

                builder.append(companyName);

            }



            if (!TextUtils.isEmpty(departmentName)) {

                if (builder.length() > 0) {

                    builder.append(", ");

                }

                builder.append(departmentName);

            }



            if (!TextUtils.isEmpty(titleName)) {

                if (builder.length() > 0) {

                    builder.append(", ");

                }

                builder.append(titleName);

            }



            return builder.toString();

        }



        @Override

        public String toString() {

            return String.format(
@@ -1008,6 +1031,8 @@ public class VCardEntry { 
            mDisplayName = mPhoneList.get(0).data;

        } else if (mPostalList != null && mPostalList.size() > 0) {

            mDisplayName = mPostalList.get(0).getFormattedAddress(mVCardType);

        } else if (mOrganizationList != null && mOrganizationList.size() > 0) {

            mDisplayName = mOrganizationList.get(0).getFormattedString();

        }



        if (mDisplayName == null) {