sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed enter jid menu item id

This commit is contained in:
Daniel Gultsch 2017-03-05 11:40:48 +01:00
parent bb7780eae6
commit cae993a95f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/entities/Blockable.java
View File

@ -3,9 +3,9 @@ package eu.siacs.conversations.entities;
import eu.siacs.conversations.xmpp.jid.Jid; import eu.siacs.conversations.xmpp.jid.Jid;
public interface Blockable { 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();
} }

4
src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
View File

@ -68,14 +68,14 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
@Override @Override
public boolean onCreateOptionsMenu(final Menu menu) { public boolean onCreateOptionsMenu(final Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
menu.findItem(R.id.action_add_contact).setVisible(true); menu.findItem(R.id.action_block_jid).setVisible(true);
return true; return true;
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_add_contact: case R.id.action_block_jid:
showEnterJidDialog(); showEnterJidDialog();
return true; return true;
} }

2
src/main/res/menu/choose_contact.xml
View File

@ -16,7 +16,7 @@
android:visible="false"/> android:visible="false"/>
<item <item
android:id="@+id/action_add_contact" android:id="@+id/action_block_jid"
android:icon="?attr/icon_add_person" android:icon="?attr/icon_add_person"
android:showAsAction="always" android:showAsAction="always"
android:title="@string/block_jabber_id" android:title="@string/block_jabber_id"