don't show contact details when in conversations with self

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Conversation.java   | 4 +
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 1 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 4 
3 files changed, 8 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -336,6 +336,10 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return this.correctingMessage;
 	}
 
+	public boolean withSelf() {
+		return getContact().isSelf();
+	}
+
 	public interface OnMessageFound {
 		void onMessageFound(final Message message);
 	}

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

@@ -411,6 +411,7 @@ public class ConversationActivity extends XmppActivity
 					menuInviteContact.setVisible(getSelectedConversation().getMucOptions().canInvite());
 					menuSecure.setVisible((Config.supportOpenPgp() || Config.supportOmemo()) && Config.multipleEncryptionChoices()); //only if pgp is supported we have a choice
 				} else {
+					menuContactDetails.setVisible(!this.getSelectedConversation().withSelf());
 					menuMucDetails.setVisible(false);
 					menuSecure.setVisible(Config.multipleEncryptionChoices());
 				}

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();