From cae993a95f4518ea91f7fe4dc92e192cd2ac8dc1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 5 Mar 2017 11:40:48 +0100
Subject: [PATCH] renamed enter jid menu item id

---
 .../eu/siacs/conversations/entities/Blockable.java     | 10 +++++-----
 .../eu/siacs/conversations/ui/BlocklistActivity.java   |  4 ++--
 src/main/res/menu/choose_contact.xml                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Blockable.java b/src/main/java/eu/siacs/conversations/entities/Blockable.java
index dbcd55c4..60869067 100644
--- a/src/main/java/eu/siacs/conversations/entities/Blockable.java
+++ b/src/main/java/eu/siacs/conversations/entities/Blockable.java
@@ -3,9 +3,9 @@ package eu.siacs.conversations.entities;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
 public interface Blockable {
-	public boolean isBlocked();
-	public boolean isDomainBlocked();
-	public Jid getBlockedJid();
-	public Jid getJid();
-	public Account getAccount();
+	boolean isBlocked();
+	boolean isDomainBlocked();
+	Jid getBlockedJid();
+	Jid getJid();
+	Account getAccount();
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
index 083c7e72..c63cd4c9 100644
--- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
@@ -68,14 +68,14 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		super.onCreateOptionsMenu(menu);
-		menu.findItem(R.id.action_add_contact).setVisible(true);
+		menu.findItem(R.id.action_block_jid).setVisible(true);
 		return true;
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-			case R.id.action_add_contact:
+			case R.id.action_block_jid:
 				showEnterJidDialog();
 				return true;
 		}
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index 3b16567e..4a7553f3 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -16,7 +16,7 @@
         android:visible="false"/>
 
     <item
-        android:id="@+id/action_add_contact"
+        android:id="@+id/action_block_jid"
         android:icon="?attr/icon_add_person"
         android:showAsAction="always"
         android:title="@string/block_jabber_id"