aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/sysactivity
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2012-06-19 14:24:22 +0000
committerDamian Minkov <damencho@jitsi.org>2012-06-19 14:24:22 +0000
commit161d186f5e7ca53b63bdb20c88101b863d9a3498 (patch)
treee083717663936d84283046881025575c7e01f40e /src/net/java/sip/communicator/impl/sysactivity
parent5d5788b116924f06343a68c73d70dab1579ca24c (diff)
downloadjitsi-161d186f5e7ca53b63bdb20c88101b863d9a3498.zip
jitsi-161d186f5e7ca53b63bdb20c88101b863d9a3498.tar.gz
jitsi-161d186f5e7ca53b63bdb20c88101b863d9a3498.tar.bz2
Fixes handling away status after successful reconnection.
Fixes a problem in reconnect plugin where several reconnects can happen, after several reconnection retries. Fixes reconnection after xmpp connection throws ConnectException or NoRouteToHostException.
Diffstat (limited to 'src/net/java/sip/communicator/impl/sysactivity')
-rw-r--r--src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java
index 4f945fc..c3dc2f5 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java
@@ -369,8 +369,12 @@ public class SystemActivityNotificationsServiceImpl
}
else if(idleTime != 0)
{
- long minIdleSetting =
- Collections.min(idleChangeListeners.values());
+ long minIdleSetting = CHECK_FOR_IDLE_DEFAULT;
+
+ if(!idleChangeListeners.isEmpty())
+ minIdleSetting =
+ Collections.min(idleChangeListeners.values());
+
int newSetting = (int)(minIdleSetting - idleTime) + 1000;
if(newSetting > 0)