moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-11-26 19:02:17 -05:00
Code Issues Releases Wiki Activity

Merged patch of tkn

Browse Source
This commit is contained in:
Sebastian Kaspari 2010-04-11 22:11:47 +02:00
parent c866d7ef3e
commit f0aabcde8b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/yaaic/activity/ConversationActivity.java
View File

@ -242,15 +242,11 @@ public class ConversationActivity extends Activity implements ServiceConnection,
case R.id.close: case R.id.close:
Conversation conversationToClose = deckAdapter.getItem(deck.getSelectedItemPosition()); Conversation conversationToClose = deckAdapter.getItem(deck.getSelectedItemPosition());
// Make sure we part a channel when closing the channel conversation // Make sure we part a channel when closing the channel conversation
if(conversationToClose.getType() == Conversation.TYPE_CHANNEL) { if (conversationToClose.getType() == Conversation.TYPE_CHANNEL) {
binder.getService().getConnection(serverId).partChannel(conversationToClose.getName()); binder.getService().getConnection(serverId).partChannel(conversationToClose.getName());
} }
if (conversationToClose.getType() != Conversation.TYPE_SERVER) { else if (conversationToClose.getType() == Conversation.TYPE_QUERY) {
if (conversationToClose.getType() == Conversation.TYPE_CHANNEL) { onRemoveConversation(conversationToClose.getName());
binder.getService().getConnection(server.getId()).partChannel(conversationToClose.getName());
} else {
onRemoveConversation(conversationToClose.getName());
}
} else { } else {
Toast.makeText(this, "You can not close the server info window", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "You can not close the server info window", Toast.LENGTH_SHORT).show();
} }