empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert to preferring system photos over profile photos.

Browse source
This commit is contained in:
Greyson Parrelli 2020-04-24 08:45:58 -04:00
parent 5193a5d309
commit b8e909a134
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
View file

@ -259,10 +259,10 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
} }
private Optional<SignalServiceAttachmentStream> getAvatar(@NonNull RecipientId recipientId, @Nullable Uri uri) { private Optional<SignalServiceAttachmentStream> getAvatar(@NonNull RecipientId recipientId, @Nullable Uri uri) {
Optional<SignalServiceAttachmentStream> stream = getProfileAvatar(recipientId); Optional<SignalServiceAttachmentStream> stream = getSystemAvatar(uri);
if (!stream.isPresent()) { if (!stream.isPresent()) {
return getSystemAvatar(uri); return getProfileAvatar(recipientId);
} }
return stream; return stream;

2
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -634,8 +634,8 @@ public class Recipient {
public @Nullable ContactPhoto getContactPhoto() { public @Nullable ContactPhoto getContactPhoto() {
if (localNumber) return null; if (localNumber) return null;
else if (isGroupInternal() && groupAvatarId.isPresent()) return new GroupRecordContactPhoto(groupId, groupAvatarId.get()); else if (isGroupInternal() && groupAvatarId.isPresent()) return new GroupRecordContactPhoto(groupId, groupAvatarId.get());
else if (profileAvatar != null && hasProfileImage) return new ProfileContactPhoto(this, profileAvatar);
else if (systemContactPhoto != null) return new SystemContactPhoto(id, systemContactPhoto, 0); else if (systemContactPhoto != null) return new SystemContactPhoto(id, systemContactPhoto, 0);
else if (profileAvatar != null && hasProfileImage) return new ProfileContactPhoto(this, profileAvatar);
else return null; else return null;
} }