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

Commit 25e945a4 authored by Hemant Gupta's avatar Hemant Gupta Committed by Matthew Xie
Browse files

PBAP: Compare Name and ID both for getting vcard by number 

This change will add a ID comparison along with the
Name before writing the final vcard entry when we get
the list through getContactsNamesByNumber
to avoid providing the vcard having the same name but
different numbers.

Change-Id: Ie2e1567a784cd3d872495a029fce6b51a39de993
parent 87a2f6fa

android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java

+5 −2
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
                    if (D) Log.d(TAG, "currentValue=" + currentValue);

                    if (currentValue.startsWith(compareValue)) {

                        itemsFound++;

                        currentValue = currentValue.substring(0, currentValue.lastIndexOf(','));

                        writeVCardEntry(pos, currentValue,result);

                    }

                }
@@ -624,8 +625,10 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
            for (int pos = listStartOffset; pos < listSize &&

                    itemsFound < requestSize; pos++) {

                currentValue = nameList.get(pos);

                if (D) Log.d(TAG, "currentValue=" + currentValue);

                if (searchValue == null || currentValue.startsWith(compareValue)) {

                if (currentValue.contains(","))

                    currentValue = currentValue.substring(0, currentValue.lastIndexOf(','));



                if (searchValue == null || (currentValue.toLowerCase()).equals(compareValue.toLowerCase())) {

                    itemsFound++;

                    writeVCardEntry(pos, currentValue,result);

                }

android/app/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

+3 −2
Original line number Diff line number Diff line
@@ -264,10 +264,11 @@ public class BluetoothPbapVcardManager { 
                for (contactCursor.moveToFirst(); !contactCursor.isAfterLast(); contactCursor

                        .moveToNext()) {

                    String name = contactCursor.getString(CONTACTS_NAME_COLUMN_INDEX);

                    long id = contactCursor.getLong(CONTACTS_ID_COLUMN_INDEX);

                    if (TextUtils.isEmpty(name)) {

                        name = mContext.getString(android.R.string.unknownName);

                    }

                    nameList.add(name);

                    nameList.add(name + "," + id);

                }

            }

        } finally {
@@ -304,7 +305,7 @@ public class BluetoothPbapVcardManager { 
                        name = mContext.getString(android.R.string.unknownName);

                    }

                    if (V) Log.v(TAG, "got name " + name + " by number " + phoneNumber + " @" + id);

                    nameList.add(name);

                    nameList.add(name + "," + id);

                }

            }

        } finally {