From 856029a6113cf1b769b51e58b191c187832aa9f9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 9 Aug 2016 17:26:18 +0200 Subject: don't do idle ping if close_tcp option is set --- .../java/eu/siacs/conversations/services/XmppConnectionService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index cf850b9b..d1c7081d 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -581,7 +581,8 @@ public class XmppConnectionService extends Service { refreshAllGcmTokens(); break; case ACTION_IDLE_PING: - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M + && !Config.CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND) { scheduleNextIdlePing(); } break; @@ -799,7 +800,8 @@ public class XmppConnectionService extends Service { toggleForegroundService(); updateUnreadCountBadge(); toggleScreenEventReceiver(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M + && !Config.CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND) { scheduleNextIdlePing(); } } -- cgit v1.2.3