Merge pull request #1289 from kriztan/patch-2
show contact details in conference details ...
This commit is contained in:
commit
2d2da11bfa
|
@ -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;
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
<?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"
|
||||
|
@ -29,4 +33,4 @@
|
|||
android:id="@+id/remove_from_room"
|
||||
android:title="@string/remove_from_room"
|
||||
android:visible="false"/>
|
||||
</menu>
|
||||
</menu>
|
||||
|
|
Loading…
Reference in New Issue