From 30442e84e1a845f4aed59d6c787c2f791b00ecdd Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 30 Apr 2018 23:51:17 +0200
Subject: click on avatars in message search opens contact details

---
 .../pixart/messenger/ui/ConversationFragment.java  | 26 ++++++----------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 6d45cf306..bf16aa428 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1203,6 +1203,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         binding.messagesView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
         messageListAdapter = new MessageAdapter((XmppActivity) getActivity(), this.messageList);
         messageListAdapter.setOnContactPictureClicked(message -> {
+            String fingerprint;
+            if (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+                fingerprint = "pgp";
+            } else {
+                fingerprint = message.getFingerprint();
+            }
             final boolean received = message.getStatus() <= Message.STATUS_RECEIVED;
             if (received) {
                 if (message.getConversation() instanceof Conversation && message.getConversation().getMode() == Conversation.MODE_MULTI) {
@@ -1221,30 +1227,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                     return;
                 } else {
                     if (!message.getContact().isSelf()) {
-                        String fingerprint;
-                        if (message.getEncryption() == Message.ENCRYPTION_PGP
-                                || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-                            fingerprint = "pgp";
-                        } else {
-                            fingerprint = message.getFingerprint();
-                        }
                         activity.switchToContactDetails(message.getContact(), fingerprint);
                         return;
                     }
                 }
             }
-            Account account = message.getConversation().getAccount();
-            Intent intent = new Intent(activity, EditAccountActivity.class);
-            intent.putExtra("jid", account.getJid().asBareJid().toString());
-            String fingerprint;
-            if (message.getEncryption() == Message.ENCRYPTION_PGP
-                    || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-                fingerprint = "pgp";
-            } else {
-                fingerprint = message.getFingerprint();
-            }
-            intent.putExtra("fingerprint", fingerprint);
-            startActivity(intent);
+            activity.switchToAccount(message.getConversation().getAccount(), fingerprint);
         });
         messageListAdapter.setOnContactPictureLongClicked(message -> {
             if (message.getStatus() <= Message.STATUS_RECEIVED) {
-- 
cgit v1.2.3