From fc3f5ef99e3f0e4f073c94189b93fa9ab29e26eb Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Fri, 15 Apr 2016 17:41:50 +0200 Subject: [PATCH] Only reset Roster on clean termination As otherwise the Roster would be still unitialized after a SM resumption if the connection was uncleanly terminated. Thanks to Grigory Fedorov for reporting this. --- .../src/main/java/org/jivesoftware/smack/roster/Roster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java index 8f6a7c4cb..57cba10d6 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java @@ -33,7 +33,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.logging.Level; import java.util.logging.Logger; -import org.jivesoftware.smack.AbstractConnectionClosedListener; +import org.jivesoftware.smack.AbstractConnectionListener; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.ExceptionCallback; import org.jivesoftware.smack.Manager; @@ -279,7 +279,7 @@ public final class Roster extends Manager { }, PresenceTypeFilter.SUBSCRIBE); // Listen for connection events - connection.addConnectionListener(new AbstractConnectionClosedListener() { + connection.addConnectionListener(new AbstractConnectionListener() { @Override public void authenticated(XMPPConnection connection, boolean resumed) { @@ -299,7 +299,7 @@ public final class Roster extends Manager { } @Override - public void connectionTerminated() { + public void connectionClosed() { // Changes the presence available contacts to unavailable setOfflinePresencesAndResetLoaded(); }