narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

fixed history deletion. fixed #780

Browse source
This commit is contained in:
iNPUTmice 2014-12-15 17:14:27 +01:00
parent a6cfbf2f2d
commit 2bd4621245
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -2086,6 +2086,16 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
} }
public void clearConversationHistory(final Conversation conversation) {
conversation.clearMessages();
new Thread(new Runnable() {
@Override
public void run() {
databaseBackend.deleteMessagesInConversation(conversation);
}
}).start();
}
public interface OnConversationUpdate { public interface OnConversationUpdate {
public void onConversationUpdate(); public void onConversationUpdate();
} }

2
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -491,7 +491,7 @@ public class ConversationActivity extends XmppActivity implements
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
conversation.clearMessages(); ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
if (endConversationCheckBox.isChecked()) { if (endConversationCheckBox.isChecked()) {
endConversation(conversation); endConversation(conversation);
} else { } else {