mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Merge pull request #924 from deltachat/issue-817
Wrong group picture shown in group settings #817
This commit is contained in:
@@ -170,7 +170,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
|
||||
glideRequests.load(recipient.getContactPhoto(this))
|
||||
.fallback(recipient.getFallbackContactPhoto().asCallCard(this))
|
||||
.error(recipient.getFallbackContactPhoto().asCallCard(this))
|
||||
.diskCacheStrategy(DiskCacheStrategy.ALL)
|
||||
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
||||
.into(this.avatar);
|
||||
|
||||
if (recipient.getContactPhoto(this) == null) this.avatar.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
|
||||
|
||||
@@ -12,7 +12,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
|
||||
import org.thoughtcrime.securesms.ProfileActivity;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.RecipientPreferenceActivity;
|
||||
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
|
||||
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
|
||||
import org.thoughtcrime.securesms.mms.GlideRequests;
|
||||
@@ -52,7 +51,7 @@ public class AvatarImageView extends AppCompatImageView {
|
||||
requestManager.load(contactPhoto)
|
||||
.fallback(recipient.getFallbackAvatarDrawable(getContext()))
|
||||
.error(recipient.getFallbackAvatarDrawable(getContext()))
|
||||
.diskCacheStrategy(DiskCacheStrategy.ALL)
|
||||
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
||||
.circleCrop()
|
||||
.into(this);
|
||||
if(quickContactEnabled) {
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
|
||||
try {
|
||||
setLargeIcon(GlideApp.with(context.getApplicationContext())
|
||||
.load(contactPhoto)
|
||||
.diskCacheStrategy(DiskCacheStrategy.ALL)
|
||||
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
||||
.circleCrop()
|
||||
.submit(context.getResources().getDimensionPixelSize(android.R.dimen.notification_large_icon_width),
|
||||
context.getResources().getDimensionPixelSize(android.R.dimen.notification_large_icon_height))
|
||||
|
||||
@@ -77,7 +77,7 @@ public class ProfilePreference extends Preference {
|
||||
.load(profileImage)
|
||||
.error(new ResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp).asDrawable(getContext(), getContext().getResources().getColor(R.color.grey_400)))
|
||||
.circleCrop()
|
||||
.diskCacheStrategy(DiskCacheStrategy.ALL)
|
||||
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
||||
.into(avatarView);
|
||||
|
||||
if (!TextUtils.isEmpty(profileName)) {
|
||||
|
||||
Reference in New Issue
Block a user