diff options
author | Christian S <christian@pix-art.de> | 2016-04-09 20:46:13 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-04-09 20:46:13 +0200 |
commit | 4d4ec6824b6e49b0e241e5b69d49a89003a27f85 (patch) | |
tree | 3b17e8d73f5b258b406eeae81d70828f16c81aa4 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
parent | b8ec4663db7fb597ec4a4030ac9ea508e885d9e5 (diff) | |
parent | 65548ddccb7f63d623a86ad9a740ded87310e313 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index c43059170..ca996b505 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -468,7 +468,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa highlightInConference(user); } } else { - activity.switchToContactDetails(message.getContact(), message.getFingerprint()); + if (!message.getContact().isSelf()) { + activity.switchToContactDetails(message.getContact(), message.getFingerprint()); + } } } else { Account account = message.getConversation().getAccount(); |