diff options
| author | Christian S <christian@pix-art.de> | 2016-01-16 10:59:08 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-16 10:59:08 +0100 |
| commit | 7b6b95caaf193af019b0d606a020a42094db26fa (patch) | |
| tree | 70d9903a8d8bea826826747d4d4687344c4d85e7 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 188e0a118cd0d9d0e009f4b0b062165f60f1a3da (diff) | |
| parent | ca7b3978281451287c052f1c8bc58de85eff6f35 (diff) | |
Merge 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index e707fc985..6e3e626a5 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2478,7 +2478,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa Thread thread = new Thread(account.getXmppConnection()); account.getXmppConnection().setInteractive(interactive); thread.start(); - scheduleWakeUpCall(Config.CONNECT_TIMEOUT, account.getUuid().hashCode()); + scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode()); } else { account.getRoster().clearPresences(); account.setXmppConnection(null); |