Bookmarks2: support retraction

1 files changed, 9 insertions, 11 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 6fdd8c50a..297467558 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -3,11 +3,8 @@ package de.pixart.messenger.ui;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import androidx.databinding.DataBindingUtil;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
@@ -18,6 +15,10 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.databinding.DataBindingUtil;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -246,7 +247,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 final Bookmark bookmark = mConversation.getBookmark();
                 if (bookmark != null) {
                     bookmark.setAutojoin(this.binding.autojoinCheckbox.isChecked());
-                    xmppConnectionService.pushBookmarks(bookmark.getAccount());
+                    xmppConnectionService.createBookmark(mConversation.getAccount(), bookmark);
                     updateView();
                 }
             }
@@ -419,13 +420,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     }
 
     protected void deleteBookmark() {
-        Account account = mConversation.getAccount();
-        Bookmark bookmark = mConversation.getBookmark();
-        if (bookmark != null) {
-            account.getBookmarks().remove(bookmark);
-            bookmark.setConversation(null);
-        }
-        xmppConnectionService.pushBookmarks(account);
+        final Account account = mConversation.getAccount();
+        final Bookmark bookmark = mConversation.getBookmark();
+        bookmark.setConversation(null);
+        xmppConnectionService.deleteBookmark(account, bookmark);
         updateView();
     }