diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index d98d56719..e9fa5c1fb 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -38,11 +38,14 @@ import com.b44t.messenger.DcMsg; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientProvider; +import org.thoughtcrime.securesms.util.Hash; +import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; import java.io.BufferedInputStream; @@ -176,13 +179,30 @@ public class ApplicationDcContext extends DcContext { participants.add(getRecipient(RECIPIENT_TYPE_CONTACT, contactId)); } RecipientProvider.RecipientDetails recipientDetails = new RecipientProvider.RecipientDetails(chat.getName(), null, false, null, participants); - return new Recipient(Address.fromChat(chat.getId()), recipientDetails); + Recipient recipient = new Recipient(Address.fromChat(chat.getId()), recipientDetails); + if (!chat.isGroup()) { + String identifier = Hash.sha256(chat.getName() + chat.getSubtitle()); + Uri systemContactPhoto = TextSecurePreferences.getSystemContactPhoto(context, identifier); + if (systemContactPhoto != null) { + recipient.setSystemContactPhoto(systemContactPhoto); + } + } + return recipient; } @NonNull public Recipient getRecipient(DcContact contact) { RecipientProvider.RecipientDetails recipientDetails = new RecipientProvider.RecipientDetails(contact.getDisplayName(), null, false, null, null); - return new Recipient(Address.fromContact(contact.getId()), recipientDetails); + Recipient recipient = new Recipient(Address.fromContact(contact.getId()), recipientDetails); + String identifier = Hash.sha256(contact.getName() + contact.getAddr()); + Uri systemContactPhoto = TextSecurePreferences.getSystemContactPhoto(context, identifier); + if (systemContactPhoto != null) { + recipient.setSystemContactPhoto(systemContactPhoto); + } + if (contact.getId() == DcContact.DC_CONTACT_ID_SELF) { + recipient.setProfileAvatar("SELF"); + } + return recipient; } @NonNull diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java index 331d17dad..6b1235d84 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms.contacts; import android.content.Context; -import android.net.Uri; import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; @@ -18,8 +17,6 @@ import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; -import org.thoughtcrime.securesms.util.Hash; -import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -72,11 +69,6 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM } else { this.recipient = DcHelper.getContext(getContext()).getRecipient(contact); - String identifier = Hash.sha256(contact.getName() + contact.getAddr()); - Uri systemContactPhoto = TextSecurePreferences.getSystemContactPhoto(getContext(), identifier); - if (systemContactPhoto != null) { - this.recipient.setSystemContactPhoto(systemContactPhoto); - } this.recipient.addListener(this); if (this.recipient.getName() != null) { name = this.recipient.getName(); diff --git a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java index 2635a0b45..73c2bced1 100644 --- a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java +++ b/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java @@ -44,6 +44,8 @@ public class AvatarHelper { if (bitmap == null) { return; } + //noinspection ResultOfMethodCallIgnored + new File(getAvatarDirectoryPath(context)).mkdirs(); DcContext dcContext = DcHelper.getContext(context); String avatarPath = dcContext.getChat(chatId).getProfileImage(); if (avatarPath != null && !avatarPath.isEmpty()) {