aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-03 05:01:02 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-03 05:01:02 +0100
commitc609eefefac5097c7c40a9f1b8741e9634da316f (patch)
tree53363dfbab46d84e81b8b95f49e586374dc358f0 /src/eu/siacs/conversations/ui/ConversationActivity.java
parent2ab6cb0ada6370e6ea83a73e0a6a39ea3ff90715 (diff)
api changes. muc options
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 7660b8fd..f826040b 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -208,17 +208,7 @@ public class ConversationActivity extends XmppActivity {
getActionBar().setDisplayHomeAsUpEnabled(false);
getActionBar().setTitle(R.string.app_name);
invalidateOptionsMenu();
-
- InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
- View focus = getCurrentFocus();
-
- if (focus != null) {
-
- inputManager.hideSoftInputFromWindow(
- focus.getWindowToken(),
- InputMethodManager.HIDE_NOT_ALWAYS);
- }
+ hideKeyboard();
}
@Override
@@ -316,6 +306,11 @@ public class ConversationActivity extends XmppActivity {
builder.create().show();
}
break;
+ case R.id.action_muc_details:
+ DialogMucDetails mucDetails = new DialogMucDetails();
+ mucDetails.setConversation(getSelectedConversation());
+ mucDetails.show(getFragmentManager(), "details");
+ break;
case R.id.action_security:
final Conversation selConv = getSelectedConversation();
View menuItemView = findViewById(R.id.action_security);