moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-08-13 16:53:50 -04:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/tkn/Yaaic

Browse Source
This commit is contained in:
Sebastian Kaspari 2010-04-11 22:10:06 +02:00
commit c866d7ef3e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.properties
View File

@ -10,4 +10,4 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-3
target=android-7

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

@ -241,6 +241,10 @@ public class ConversationActivity extends Activity implements ServiceConnection,
break;
case R.id.close:
Conversation conversationToClose = deckAdapter.getItem(deck.getSelectedItemPosition());
// Make sure we part a channel when closing the channel conversation
if(conversationToClose.getType() == Conversation.TYPE_CHANNEL) {
binder.getService().getConnection(serverId).partChannel(conversationToClose.getName());
}
if (conversationToClose.getType() != Conversation.TYPE_SERVER) {
if (conversationToClose.getType() == Conversation.TYPE_CHANNEL) {
binder.getService().getConnection(server.getId()).partChannel(conversationToClose.getName());