do not show 'delete contact' for phone contacts. do not treat as stranger

Daniel Gultsch created 7 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Conversation.java        | 1 
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 2 
2 files changed, 3 insertions(+)

Detailed changes

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

@@ -931,6 +931,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 				&& !contact.isOwnServer()
 				&& !contact.showInRoster()
 				&& !contact.isSelf()
+				&& !contact.showInPhoneBook()
 				&& sentMessagesCount() == 0;
 	}
 

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

@@ -1050,9 +1050,11 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 				final Contact contact = (Contact) activity.contacts.get(acmi.position);
 				final MenuItem blockUnblockItem = menu.findItem(R.id.context_contact_block_unblock);
 				final MenuItem showContactDetailsItem = menu.findItem(R.id.context_contact_details);
+				final MenuItem deleteContactMenuItem = menu.findItem(R.id.context_delete_contact);
 				if (contact.isSelf()) {
 					showContactDetailsItem.setVisible(false);
 				}
+				deleteContactMenuItem.setVisible(contact.showInRoster());
 				XmppConnection xmpp = contact.getAccount().getXmppConnection();
 				if (xmpp != null && xmpp.getFeatures().blocking() && !contact.isSelf()) {
 					if (contact.isBlocked()) {