aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-15 17:14:27 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-15 17:14:27 +0100
commit2bd4621245dfcf1a64f68e1c3d1ae82e44cbe4b9 (patch)
treed931512867c368e1463b91ab2003be29ef5fa9aa /src/main
parenta6cfbf2f2d4b8d16db2275505e17873e5df1e3c3 (diff)
fixed history deletion. fixed #780
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java10
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index b7ca699c..ef93dcc7 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -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 void onConversationUpdate();
}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index a5efe12e..6656de2b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -491,7 +491,7 @@ public class ConversationActivity extends XmppActivity implements
@Override
public void onClick(DialogInterface dialog, int which) {
- conversation.clearMessages();
+ ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
if (endConversationCheckBox.isChecked()) {
endConversation(conversation);
} else {