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

Unverified Commit d8bb5749 authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

Fix NPE when 'merge contacts' encounters unknown names.

Change-Id: I4481cd8cb2df096acc027c00f9e267817cf3d7a1
parent 180eb48b
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -48,9 +48,11 @@ import java.util.ArrayList;
public class MergeContactAdapter extends BaseAdapter {
    private Context mContext;
    private ArrayList<DuplicatesUtils.MergeContacts> mMergeList;
    private final CharSequence mUnknownNameText;

    public MergeContactAdapter(Context context) {
        this.mContext = context;
        mUnknownNameText = context.getText(android.R.string.unknownName);
    }

    @Override
@@ -111,6 +113,7 @@ public class MergeContactAdapter extends BaseAdapter {
            number = info.getPhones().get(0);
        }
        // show the number, if it exists. Otherwise just show the name.
        childView.setUnknownNameText(mUnknownNameText);
        childView.setPhoneNumber(number, null);
        childView.setDisplayName(info.getName());
    }