Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 03:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce profile avatar disk reads.

Browse Source
This commit is contained in:
Cody Henthorne
2022-07-13 14:48:25 -04:00
parent 2f17963b2b
commit 819f7a170f
16 changed files with 81 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
View File

@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.libsignal.protocol.util.ByteUtil;
import org.thoughtcrime.securesms.database.model.ProfileAvatarFileDetails;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.profiles.AvatarHelper;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -19,12 +20,14 @@ import java.util.Objects;
public class ProfileContactPhoto implements ContactPhoto {
private final @NonNull Recipient recipient;
private final @NonNull String avatarObject;
private final @NonNull Recipient recipient;
private final @NonNull String avatarObject;
private final @NonNull ProfileAvatarFileDetails profileAvatarFileDetails;
public ProfileContactPhoto(@NonNull Recipient recipient, @Nullable String avatarObject) {
this.recipient = recipient;
this.avatarObject = avatarObject == null ? "" : avatarObject;
public ProfileContactPhoto(@NonNull Recipient recipient) {
this.recipient = recipient;
this.avatarObject = recipient.getProfileAvatar() == null ? "" : recipient.getProfileAvatar();
this.profileAvatarFileDetails = recipient.getProfileAvatarFileDetails();
}
@Override
@@ -46,7 +49,7 @@ public class ProfileContactPhoto implements ContactPhoto {
public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
messageDigest.update(recipient.getId().serialize().getBytes());
messageDigest.update(avatarObject.getBytes());
messageDigest.update(ByteUtil.longToByteArray(getFileLastModified()));
messageDigest.update(profileAvatarFileDetails.getDiskCacheKeyBytes());
}
@Override
@@ -55,16 +58,12 @@ public class ProfileContactPhoto implements ContactPhoto {
if (o == null || getClass() != o.getClass()) return false;
ProfileContactPhoto that = (ProfileContactPhoto) o;
return recipient.equals(that.recipient) &&
avatarObject.equals(that.avatarObject) &&
getFileLastModified() == that.getFileLastModified();
avatarObject.equals(that.avatarObject) &&
profileAvatarFileDetails.equals(that.profileAvatarFileDetails);
}
@Override
public int hashCode() {
return Objects.hash(recipient, avatarObject, getFileLastModified());
}
private long getFileLastModified() {
return AvatarHelper.getLastModified(ApplicationDependencies.getApplication(), recipient.getId());
return Objects.hash(recipient, avatarObject, profileAvatarFileDetails);
}
}