Make Sopranica bookmark deleteable.

root21 created 3 years ago

Added lines to first check if the bookmark has been deleted, if so skips adding the bookmark.

Change summary

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 3 
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java   | 4 
2 files changed, 6 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -1843,6 +1843,9 @@ public class XmppConnectionService extends Service {
     }
 
     public void deleteBookmark(final Account account, final Bookmark bookmark) {
+        if (bookmark.getJid().toString().equals("[e-mail]")) {
+            getPreferences().edit().putBoolean("cheogram_sopranica_bookmark_deleted", true).apply();
+        }
         account.removeBookmark(bookmark);
         final XmppConnection connection = account.getXmppConnection();
         if (connection.getFeatures().bookmarks2()) {

src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -986,7 +986,9 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 
         Collections.sort(this.contacts);
 
-        if (!foundSopranica && (needle == null || needle.equals(""))) {
+        final boolean sopranicaDeleted = getPreferences().getBoolean("cheogram_sopranica_bookmark_deleted", false);
+
+        if (!sopranicaDeleted && !foundSopranica && (needle == null || needle.equals(""))) {
             Bookmark bookmark = new Bookmark(
                 xmppConnectionService.getAccounts().get(0),
                 Jid.of("[e-mail]")