From dbd489cbcbab4778aeab8c0005e695bf6b856225 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Sep 2017 10:43:25 +0200
Subject: [PATCH] show correct tooltip when long pressing start conversations.
 fixes #2635

---
 .../ui/ConversationActivity.java              | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 8ec813ae..a044b4dc 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -443,24 +443,26 @@ public class ConversationActivity extends XmppActivity
 			}
 		}
 		if (Config.supportOmemo()) {
-			new Handler().post(new Runnable() {
-				@Override
-				public void run() {
-					View view = findViewById(R.id.action_security);
-					if (view != null) {
-						view.setOnLongClickListener(new View.OnLongClickListener() {
-							@Override
-							public boolean onLongClick(View v) {
-								return quickOmemoDebugger(getSelectedConversation());
-							}
-						});
-					}
-				}
-			});
+			new Handler().post(addOmemoDebuggerRunnable);
 		}
 		return super.onCreateOptionsMenu(menu);
 	}
 
+	private Runnable addOmemoDebuggerRunnable = new Runnable() {
+		@Override
+		public void run() {
+			View view = findViewById(R.id.action_security);
+			if (view != null) {
+				view.setOnLongClickListener(new View.OnLongClickListener() {
+					@Override
+					public boolean onLongClick(View v) {
+						return v.getId() == R.id.action_security && quickOmemoDebugger(getSelectedConversation());
+					}
+				});
+			}
+		}
+	};
+
 	private boolean quickOmemoDebugger(Conversation c) {
 		if (c != null) {
 			boolean single = c.getMode() == Conversation.MODE_SINGLE;