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

avoid unnecessary disconnect. prevent NetworkOnMainThreadException

Browse Source
This commit is contained in:
Daniel Gultsch 2016-03-03 13:31:59 +01:00
parent c9e4b332bf
commit 4cb2d0ca93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2554,9 +2554,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
private void reconnectAccount(final Account account, final boolean force, final boolean interactive) { private void reconnectAccount(final Account account, final boolean force, final boolean interactive) {
synchronized (account) { synchronized (account) {
XmppConnection connection = account.getXmppConnection(); XmppConnection connection = account.getXmppConnection();
if (connection != null) { if (connection == null) {
disconnect(account, force);
} else {
connection = createConnection(account); connection = createConnection(account);
account.setXmppConnection(connection); account.setXmppConnection(connection);
} }
@ -2570,6 +2568,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
} }
if (!force) { if (!force) {
disconnect(account, false);
try { try {
Log.d(Config.LOGTAG, "wait for disconnect"); Log.d(Config.LOGTAG, "wait for disconnect");
Thread.sleep(500); //sleep wait for disconnect Thread.sleep(500); //sleep wait for disconnect
@ -2582,6 +2581,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
thread.start(); thread.start();
scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode()); scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
} else { } else {
disconnect(account, force);
account.getRoster().clearPresences(); account.getRoster().clearPresences();
connection.resetEverything(); connection.resetEverything();
} }