keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

prevent contact number NPE

Browse Source 
Closes #5460
Fixes #5454
//FREEBIE
pull/1/head
Christian Ascheberg 9 years ago committed by Moxie Marlinspike
parent 31970c4644
commit 49a539a985
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File

19
src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
Unescape Escape View File

@ -138,13 +138,18 @@ public class RecipientProvider {
try { try {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
Uri contactUri = Contacts.getLookupUri(cursor.getLong(2), cursor.getString(1)); final String resultNumber = cursor.getString(3);
String name = cursor.getString(3).equals(cursor.getString(0)) ? null : cursor.getString(0); if (resultNumber != null) {
ContactPhoto contactPhoto = ContactPhotoFactory.getContactPhoto(context, Uri contactUri = Contacts.getLookupUri(cursor.getLong(2), cursor.getString(1));
Uri.withAppendedPath(Contacts.CONTENT_URI, cursor.getLong(2) + ""), String name = resultNumber.equals(cursor.getString(0)) ? null : cursor.getString(0);
name); ContactPhoto contactPhoto = ContactPhotoFactory.getContactPhoto(context,
Uri.withAppendedPath(Contacts.CONTENT_URI, cursor.getLong(2) + ""),
return new RecipientDetails(cursor.getString(0), cursor.getString(3), contactUri, contactPhoto, color); name);
return new RecipientDetails(cursor.getString(0), resultNumber, contactUri, contactPhoto, color);
} else {
Log.w(TAG, "resultNumber is null");
}
} }
} finally { } finally {
if (cursor != null) if (cursor != null)

Write Preview
Loading…
Cancel
Save