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

Fix crash when on recipient change called after requesting to remove observer.

Browse source
This commit is contained in:
Cody Henthorne 2023-08-01 15:31:34 -04:00 • committed by GitHub
parent e14fcf8577
commit 5e68388b01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -261,6 +261,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
private boolean hasWallpaper;
private float lastYDownRelativeToThis;
private ProjectionList colorizerProjections = new ProjectionList(3);
private boolean isBound = false;
private final Runnable shrinkBubble = new Runnable() {
@Override
@ -387,9 +388,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
this.displayMode = displayMode;
this.previousMessage = previousMessageRecord;
this.author.observeForever(this);
this.conversationRecipient.observeForever(this);
setGutterSizes(messageRecord, groupThread);
setMessageShape(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
setMediaAttributes(messageRecord, previousMessageRecord, nextMessageRecord, groupThread, hasWallpaper, isMessageRequestAccepted, allowedToPlayInline);
@ -412,6 +410,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (audioViewStub.resolved()) {
audioViewStub.get().setOnLongClickListener(passthroughClickListener);
}
isBound = true;
this.author.observeForever(this);
this.conversationRecipient.observeForever(this);
}
@Override
@ -629,6 +631,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
@Override
public void onRecipientChanged(@NonNull Recipient modified) {
if (!isBound) {
return;
}
if (conversationRecipient.getId().equals(modified.getId())) {
setBubbleState(messageRecord, modified, modified.hasWallpaper(), colorizer);
@ -683,6 +689,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
@Override
public void unbind() {
isBound = false;
if (author != null) {
author.removeForeverObserver(this);
}