Fix public chat deletion

6 years ago · 93e1cd7756
parent 60da6dc58c
commit 93e1cd7756
1 changed files with 4 additions and 1 deletions
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
@ -202,11 +202,14 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe

                override fun run() {
                    AsyncTask.execute {
-                        threadDatabase.deleteConversation(threadID)
                        val publicChat = DatabaseFactory.getLokiThreadDatabase(activity).getPublicChat(threadID)
                        if (publicChat != null) {
+                            val apiDatabase = DatabaseFactory.getLokiAPIDatabase(activity)
+                            apiDatabase.removeLastMessageServerID(publicChat.channel, publicChat.server)
+                            apiDatabase.removeLastDeletionServerID(publicChat.channel, publicChat.server)
                            ApplicationContext.getInstance(activity).lokiPublicChatAPI!!.leave(publicChat.channel, publicChat.server)
                        }
+                        threadDatabase.deleteConversation(threadID)
                        MessageNotifier.updateNotification(activity)
                    }
                }