check if service is bound before adding conferences or contacts
This commit is contained in:
parent
9f4043c679
commit
7f5456e41b
|
@ -191,7 +191,8 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
mConferenceAdapter = new ListItemAdapter(getApplicationContext(),conferences);
|
mConferenceAdapter = new ListItemAdapter(getApplicationContext(),
|
||||||
|
conferences);
|
||||||
mConferenceListFragment.setListAdapter(mConferenceAdapter);
|
mConferenceListFragment.setListAdapter(mConferenceAdapter);
|
||||||
mConferenceListFragment.setContextMenu(R.menu.conference_context);
|
mConferenceListFragment.setContextMenu(R.menu.conference_context);
|
||||||
mConferenceListFragment
|
mConferenceListFragment
|
||||||
|
@ -204,7 +205,8 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
mContactsAdapter = new ListItemAdapter(getApplicationContext(),contacts);
|
mContactsAdapter = new ListItemAdapter(getApplicationContext(),
|
||||||
|
contacts);
|
||||||
mContactsListFragment.setListAdapter(mContactsAdapter);
|
mContactsListFragment.setListAdapter(mContactsAdapter);
|
||||||
mContactsListFragment.setContextMenu(R.menu.contact_context);
|
mContactsListFragment.setContextMenu(R.menu.contact_context);
|
||||||
mContactsListFragment
|
mContactsListFragment
|
||||||
|
@ -270,8 +272,7 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||||
builder.setNegativeButton(R.string.cancel, null);
|
builder.setNegativeButton(R.string.cancel, null);
|
||||||
builder.setTitle(R.string.action_delete_contact);
|
builder.setTitle(R.string.action_delete_contact);
|
||||||
builder.setMessage(
|
builder.setMessage(getString(R.string.remove_contact_text,
|
||||||
getString(R.string.remove_contact_text,
|
|
||||||
contact.getJid()));
|
contact.getJid()));
|
||||||
builder.setPositiveButton(R.string.delete, new OnClickListener() {
|
builder.setPositiveButton(R.string.delete, new OnClickListener() {
|
||||||
|
|
||||||
|
@ -292,8 +293,7 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||||
builder.setNegativeButton(R.string.cancel, null);
|
builder.setNegativeButton(R.string.cancel, null);
|
||||||
builder.setTitle(R.string.delete_bookmark);
|
builder.setTitle(R.string.delete_bookmark);
|
||||||
builder.setMessage(
|
builder.setMessage(getString(R.string.remove_bookmark_text,
|
||||||
getString(R.string.remove_bookmark_text,
|
|
||||||
bookmark.getJid()));
|
bookmark.getJid()));
|
||||||
builder.setPositiveButton(R.string.delete, new OnClickListener() {
|
builder.setPositiveButton(R.string.delete, new OnClickListener() {
|
||||||
|
|
||||||
|
@ -331,6 +331,9 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
if (!xmppConnectionServiceBound) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (Validator.isValidJid(jid.getText().toString())) {
|
if (Validator.isValidJid(jid.getText().toString())) {
|
||||||
String accountJid = (String) spinner
|
String accountJid = (String) spinner
|
||||||
.getSelectedItem();
|
.getSelectedItem();
|
||||||
|
@ -377,6 +380,9 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
if (!xmppConnectionServiceBound) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (Validator.isValidJid(jid.getText().toString())) {
|
if (Validator.isValidJid(jid.getText().toString())) {
|
||||||
String accountJid = (String) spinner
|
String accountJid = (String) spinner
|
||||||
.getSelectedItem();
|
.getSelectedItem();
|
||||||
|
@ -398,7 +404,8 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
conferenceJid, true);
|
conferenceJid, true);
|
||||||
conversation.setBookmark(bookmark);
|
conversation.setBookmark(bookmark);
|
||||||
if (!conversation.getMucOptions().online()) {
|
if (!conversation.getMucOptions().online()) {
|
||||||
xmppConnectionService.joinMuc(conversation);
|
xmppConnectionService
|
||||||
|
.joinMuc(conversation);
|
||||||
}
|
}
|
||||||
switchToConversation(conversation);
|
switchToConversation(conversation);
|
||||||
}
|
}
|
||||||
|
@ -468,10 +475,8 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onKeyUp(int keyCode, KeyEvent event)
|
public boolean onKeyUp(int keyCode, KeyEvent event) {
|
||||||
{
|
if (keyCode == KeyEvent.KEYCODE_SEARCH && !event.isLongPress()) {
|
||||||
if(keyCode == KeyEvent.KEYCODE_SEARCH && !event.isLongPress())
|
|
||||||
{
|
|
||||||
mOptionsMenu.findItem(R.id.action_search).expandActionView();
|
mOptionsMenu.findItem(R.id.action_search).expandActionView();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue