TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 08:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for when a stored contact's name field is empty.

Browse Source 
Display # instead of + in the avatar.

Closes #3141
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-05-11 01:18:11 -07:00 committed by Jake McGinty
parent 40ca2575da
commit 833fcd10ab
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/contacts/ContactPhotoFactory.java
View File

@ -62,7 +62,7 @@ public class ContactPhotoFactory {
.height(targetSize)
.endConfig()
.buildRound(String.valueOf(name.charAt(0)),
COLOR_GENERATOR.getColor(name));
COLOR_GENERATOR.getColor(name));
}
synchronized (defaultPhotoLock) {

5
src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
View File

@ -133,9 +133,10 @@ public class RecipientProvider {
try {
if (cursor != null && cursor.moveToFirst()) {
Uri contactUri = Contacts.getLookupUri(cursor.getLong(2), cursor.getString(1));
String name = cursor.getString(3).equals(cursor.getString(0)) ? null : cursor.getString(0);
Drawable contactPhoto = ContactPhotoFactory.getContactPhoto(context,
Uri.withAppendedPath(Contacts.CONTENT_URI, cursor.getLong(2)+""),
cursor.getString(0));
Uri.withAppendedPath(Contacts.CONTENT_URI, cursor.getLong(2) + ""),
name);
return new RecipientDetails(cursor.getString(0), cursor.getString(3), contactUri, contactPhoto);
}
} finally {