diff options
| author | Christian S <christian@pix-art.de> | 2016-04-04 20:44:39 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-04 20:44:39 +0200 |
| commit | 89ca103b9f2d89c0c06f68747f2c6f2a8a4c0c91 (patch) | |
| tree | 3764ba105681557736d7e95c3c8d6ac240952784 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 3e31db1746e90f460686b0a3fd55ffaa516e2bca (diff) | |
| parent | 0385e3a8d62ebe68a8c40a75ea95d3726d3839f3 (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 877e8b439..669178324 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2571,12 +2571,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa if (!account.isOptionSet(Account.OPTION_DISABLED)) { if (!force) { disconnect(account, false); - try { - Log.d(Config.LOGTAG, "wait for disconnect"); - Thread.sleep(500); //sleep wait for disconnect - } catch (InterruptedException e) { - //ignored - } } Thread thread = new Thread(connection); connection.setInteractive(interactive); |