moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2025-02-24 23:41:58 -05:00
Code Issues Releases Wiki Activity

Bugfix: Do not reconnect if user disconnects

Browse Source
This commit is contained in:
Sebastian Kaspari 2010-04-26 22:14:39 +02:00
parent a29c136240
commit da4a4021ee
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,8 +282,8 @@ public class ConversationActivity extends Activity implements ServiceConnection,
{ {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.disconnect: case R.id.disconnect:
binder.getService().getConnection(serverId).quitServer();
server.setStatus(Status.DISCONNECTED); server.setStatus(Status.DISCONNECTED);
binder.getService().getConnection(serverId).quitServer();
server.clearConversations(); server.clearConversations();
setResult(RESULT_OK); setResult(RESULT_OK);
finish(); finish();

1
src/org/yaaic/activity/ServersActivity.java
View File

@ -178,6 +178,7 @@ public class ServersActivity extends ListActivity implements ServiceConnection,
break; break;
case 1: // Disconnect case 1: // Disconnect
server.clearConversations(); server.clearConversations();
server.setStatus(Status.DISCONNECTED);
binder.getService().getConnection(server.getId()).quitServer(); binder.getService().getConnection(server.getId()).quitServer();
break; break;
case 2: // Edit case 2: // Edit

2
src/org/yaaic/irc/IRCConnection.java
View File

@ -989,7 +989,7 @@ public class IRCConnection extends PircBot
@Override @Override
public void onDisconnect() public void onDisconnect()
{ {
if (service.getSettings().isReconnectEnabled()) { if (service.getSettings().isReconnectEnabled() && server.getStatus() != Status.DISCONNECTED) {
setAutojoinChannels(server.getCurrentChannelNames()); setAutojoinChannels(server.getCurrentChannelNames());
server.clearConversations(); server.clearConversations();