From b83835d2191cc7f15c46e2d45e305e0e9094ea80 Mon Sep 17 00:00:00 2001
From: Phillip Davis <phdavis1027@gmail.com>
Date: Mon, 20 Apr 2026 16:34:34 -0400
Subject: [PATCH] yeet monocles-specific things from cherry-pick

---
 .../conversations/entities/Conversation.java  |  1 +
 .../ui/ContactDetailsActivity.java            |  9 --------
 .../ui/ConversationFragment.java              | 21 -------------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index ab0ff37699b6a0c5863a5e4cd52cc238692c5067..d499830d034cf87e519257da173f64e29a5a05e1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -115,6 +115,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 66b049b16a8970ba475fa208bd741cd86caa7659..49d50627247441aa7c0080e1d24c6b77481d61b5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -300,15 +300,6 @@ public class ContactDetailsActivity extends OmemoActivity
         mMediaAdapter = new MediaAdapter(this, R.dimen.media_size);
         this.binding.media.setAdapter(mMediaAdapter);
         GridManager.setupLayoutManager(this, this.binding.media, R.dimen.media_size);
-        this.binding.recentThreads.setOnItemClickListener((a0, v, pos, a3) -> {
-            Account thisAccount = xmppConnectionService.findAccountByJid(accountJid);
-            if (thisAccount == null) {
-                return;
-            }
-            final var conversation = xmppConnectionService.findOrCreateConversation(thisAccount, contact.getJid(), false, true);
-            final Conversation.Thread thread = (Conversation.Thread) binding.recentThreads.getAdapter().getItem(pos);
-            switchToConversation(conversation, null, false, null, false, true, null, thread.getThreadId(), null);
-        });
     }
 
     @Override
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index f927f830f1d43bf4caf1ee38457b268fc93ee0e1..48ecdaa5b2a1dc8f12119d424c90b9359ba5f2bb 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -298,30 +298,9 @@ public class ConversationFragment extends XmppFragment
     private int identiconWidth = -1;
     private File savingAsSticker = null;
     private EmojiSearch emojiSearch = null;
-    File dirStickers = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/monocles chat" + File.separator + "Stickers");
-    private String[] StickerfilesPaths;
-    private String[] StickerfilesNames;
-    private String[] GifsfilesPaths;
-    private String[] GifsfilesNames;
 
     private LinkedList<Message> replyJumps = new LinkedList<>();
 
-    private PinnedMessageRepository pinnedMessageRepository;
-    private String currentDisplayedPinnedMessageUuid = null;
-
-    private final ExecutorService backgroundExecutor = Executors.newSingleThreadExecutor();
-
-    private KeyboardHeightProvider.KeyboardHeightListener keyboardHeightListener = null;
-    private KeyboardHeightProvider keyboardHeightProvider = null;
-    private static final String PINNED_MESSAGE_KEY_PREFIX = "pinned_message_";
-
-    protected OnClickListener clickToVerify = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            activity.verifyOtrSessionDialog(conversation, v);
-        }
-    };
-
     private final OnClickListener clickToMuc =
             new OnClickListener() {