From 4864f7200bbdb3e8d45eb7f165d62274f19e2e7b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 27 Mar 2014 02:02:59 +0100 Subject: fixed a couple of muc issues. added jingle listener (which doesn't do anything for now) --- src/eu/siacs/conversations/ui/MucDetailsActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/eu/siacs/conversations/ui') diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java index 8d90fd566..bf36f156e 100644 --- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java @@ -82,9 +82,6 @@ public class MucDetailsActivity extends XmppActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getIntent().getAction().equals(ACTION_VIEW_MUC)) { - this.uuid = getIntent().getExtras().getString("uuid"); - } setContentView(R.layout.activity_muc_details); mYourNick = (EditText) findViewById(R.id.muc_your_nick); mFullJid = (TextView) findViewById(R.id.muc_jabberid); @@ -135,6 +132,9 @@ public class MucDetailsActivity extends XmppActivity { void onBackendConnected() { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); boolean useSubject = preferences.getBoolean("use_subject_in_muc", true); + if (getIntent().getAction().equals(ACTION_VIEW_MUC)) { + this.uuid = getIntent().getExtras().getString("uuid"); + } if (uuid != null) { for (Conversation mConv : xmppConnectionService.getConversations()) { if (mConv.getUuid().equals(uuid)) { @@ -183,6 +183,8 @@ public class MucDetailsActivity extends XmppActivity { membersView.addView(view); } } + } else { + Log.d("xmppService","uuid in muc details was null"); } } } -- cgit v1.2.3