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

Fix conversation item and data source memory leaks.

Browse source
This commit is contained in:
Cody Henthorne 2020-06-05 21:14:36 -04:00 • committed by Greyson Parrelli
parent b27198286d
commit afbc132faa
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
View file

@ -49,7 +49,10 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
} }
}; };
invalidator.observe(this::invalidate); invalidator.observe(() -> {
invalidate();
context.getContentResolver().unregisterContentObserver(contentObserver);
});
context.getContentResolver().registerContentObserver(DatabaseContentProviders.Conversation.getUriForThread(threadId), true, contentObserver); context.getContentResolver().registerContentObserver(DatabaseContentProviders.Conversation.getUriForThread(threadId), true, contentObserver);
} }

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

@ -377,6 +377,9 @@ public class ConversationItem extends LinearLayout implements BindableConversati
if (recipient != null) { if (recipient != null) {
recipient.removeForeverObserver(this); recipient.removeForeverObserver(this);
} }
if (conversationRecipient != null) {
conversationRecipient.removeForeverObserver(this);
}
} }
public MessageRecord getMessageRecord() { public MessageRecord getMessageRecord() {