diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-20 13:16:19 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-20 13:16:19 +0200 |
| commit | 2d2da11bfae712f6248bd0c0cd943dacd07d6201 (patch) | |
| tree | 1a6bbdc102263907851bdcbb902cfd81514a7101 /src/main | |
| parent | 857161076eb6de65806d5b2b30c92deb401eeef2 (diff) | |
| parent | 37b214a8a853dfdc1760bc69d9213484e519832f (diff) | |
Merge pull request #1289 from kriztan/patch-2
show contact details in conference details ...
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 5 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details_context.xml | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 07b8819d..614a6648 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -274,6 +274,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers name = user.getJid().toBareJid().toString(); } menu.setHeaderTitle(name); + MenuItem showContactDetails = menu.findItem(R.id.action_contact_details); MenuItem startConversation = menu.findItem(R.id.start_conversation); MenuItem giveMembership = menu.findItem(R.id.give_membership); MenuItem removeMembership = menu.findItem(R.id.remove_membership); @@ -282,6 +283,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room); MenuItem banFromConference = menu.findItem(R.id.ban_from_conference); startConversation.setVisible(true); + showContactDetails.setVisible(true); if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) && self.getAffiliation().outranks(user.getAffiliation())) { if (mAdvancedMode) { @@ -309,6 +311,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers @Override public boolean onContextItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.action_contact_details: + switchToContactDetails(mSelectedUser.getContact()); + return true; case R.id.start_conversation: startConversation(mSelectedUser); return true; diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index dc0f5d3e..592e44af 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/action_contact_details" + android:title="@string/action_contact_details" + android:visible="false" /> + <item android:id="@+id/start_conversation" android:title="@string/start_conversation" android:visible="false" /> @@ -29,4 +33,4 @@ android:id="@+id/remove_from_room" android:title="@string/remove_from_room" android:visible="false"/> -</menu>
\ No newline at end of file +</menu> |