Skip to content
Snippets Groups Projects
Commit 89215f7c authored by Adrien Béraud's avatar Adrien Béraud
Browse files

conversation: avoid crash when canceling a transfer

Change-Id: If7e3efa4cbfc92dd4ac8ff24ab308cec8f09e2c3
parent 99cdc45b
No related branches found
No related tags found
No related merge requests found
......@@ -289,7 +289,8 @@ public class Conversation extends ConversationHistory {
Iterator<Interaction> it = mAggregateHistory.iterator();
while (it.hasNext()) {
Interaction interaction = it.next();
if (interaction != null && interactionId == interaction.getId()) {
Integer id = interaction == null ? null : interaction.getId();
if (id != null && interactionId == id) {
it.remove();
return true;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment