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

Fix deadlock when retrieve avatars.

Browse source
This commit is contained in:
Cody Henthorne 2022-02-11 10:15:04 -05:00
parent 84296a3860
commit 0b47c2ae93
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
View file

@ -73,7 +73,8 @@ public class RetrieveProfileJob extends BaseJob {
private static final String TAG = Log.tag(RetrieveProfileJob.class); private static final String TAG = Log.tag(RetrieveProfileJob.class);
private static final String KEY_RECIPIENTS = "recipients"; private static final String KEY_RECIPIENTS = "recipients";
private static final String DEDUPE_KEY_RETRIEVE_AVATAR = KEY + "_RETRIEVE_PROFILE_AVATAR";
private final Set<RecipientId> recipientIds; private final Set<RecipientId> recipientIds;
@ -497,9 +498,10 @@ public class RetrieveProfileJob extends BaseJob {
private static void setProfileAvatar(Recipient recipient, String profileAvatar) { private static void setProfileAvatar(Recipient recipient, String profileAvatar) {
if (recipient.getProfileKey() == null) return; if (recipient.getProfileKey() == null) return;
if (!Util.equals(profileAvatar, recipient.getProfileAvatar())) { if (!Util.equals(profileAvatar, recipient.getProfileAvatar())) {
ApplicationDependencies.getJobManager().add(new RetrieveProfileAvatarJob(recipient, profileAvatar)); SignalDatabase.runPostSuccessfulTransaction(DEDUPE_KEY_RETRIEVE_AVATAR + recipient.getId(), () -> {
ApplicationDependencies.getJobManager().add(new RetrieveProfileAvatarJob(recipient, profileAvatar));
});
} }
} }