diff options
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Blockable.java | 10 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/BlocklistActivity.java | 4 | ||||
| -rw-r--r-- | src/main/res/menu/choose_contact.xml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Blockable.java b/src/main/java/de/pixart/messenger/entities/Blockable.java index 9357f1cdb..f7484df8a 100644 --- a/src/main/java/de/pixart/messenger/entities/Blockable.java +++ b/src/main/java/de/pixart/messenger/entities/Blockable.java @@ -3,13 +3,13 @@ package de.pixart.messenger.entities; import de.pixart.messenger.xmpp.jid.Jid; public interface Blockable { - public boolean isBlocked(); + boolean isBlocked(); - public boolean isDomainBlocked(); + boolean isDomainBlocked(); - public Jid getBlockedJid(); + Jid getBlockedJid(); - public Jid getJid(); + Jid getJid(); - public Account getAccount(); + Account getAccount(); } diff --git a/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java b/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java index c1d388231..3f6a57381 100644 --- a/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java +++ b/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java @@ -67,14 +67,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 c91fd122b..382e96017 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" |