moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 09:42:17 -05:00
Code Issues Releases Wiki Activity

avoid unnecessary thread creation

Browse Source
This commit is contained in:
iNPUTmice 2015-03-05 15:46:33 +01:00
parent c5230e081c
commit f25a824610
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1136,7 +1136,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
account.initOtrEngine(this); account.initOtrEngine(this);
databaseBackend.createAccount(account); databaseBackend.createAccount(account);
this.accounts.add(account); this.accounts.add(account);
this.reconnectAccount(account, false); this.reconnectAccountInBackground(account);
updateAccountUi(); updateAccountUi();
} }
@ -1972,24 +1972,29 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
public void reconnectAccount(final Account account, final boolean force) { public void reconnectAccount(final Account account, final boolean force) {
new Thread(new Runnable() { synchronized (account) {
if (account.getXmppConnection() != null) {
disconnect(account, force);
}
if (!account.isOptionSet(Account.OPTION_DISABLED)) {
if (account.getXmppConnection() == null) {
account.setXmppConnection(createConnection(account));
}
Thread thread = new Thread(account.getXmppConnection());
thread.start();
scheduleWakeUpCall(Config.CONNECT_TIMEOUT, account.getUuid().hashCode());
} else {
account.getRoster().clearPresences();
account.setXmppConnection(null);
}
}
}
public void reconnectAccountInBackground(final Account account) {
new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
if (account.getXmppConnection() != null) { reconnectAccount(account,false);
disconnect(account, force);
}
if (!account.isOptionSet(Account.OPTION_DISABLED)) {
if (account.getXmppConnection() == null) {
account.setXmppConnection(createConnection(account));
}
Thread thread = new Thread(account.getXmppConnection());
thread.start();
scheduleWakeUpCall(Config.CONNECT_TIMEOUT, account.getUuid().hashCode());
} else {
account.getRoster().clearPresences();
account.setXmppConnection(null);
}
} }
}).start(); }).start();
} }

2
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
View File

@ -65,7 +65,7 @@ public class SettingsActivity extends XmppActivity implements
for (Account account : xmppConnectionService.getAccounts()) { for (Account account : xmppConnectionService.getAccounts()) {
account.setResource(resource); account.setResource(resource);
if (!account.isOptionSet(Account.OPTION_DISABLED)) { if (!account.isOptionSet(Account.OPTION_DISABLED)) {
xmppConnectionService.reconnectAccount(account, false); xmppConnectionService.reconnectAccountInBackground(account);
} }
} }
} }

7
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -242,6 +242,13 @@ public class XmppConnection implements Runnable {
@Override @Override
public void run() { public void run() {
try {
if (socket != null) {
socket.close();
}
} catch (final IOException ignored) {
}
connect(); connect();
} }