Add and use AbstractConnectionClosedListener

smack-core/src/main/java/org/jivesoftware/smack/AbstractConnectionClosedListener.java

@@ -0,0 +1,35 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack;
+
+/**
+ * 
+ */
+public abstract class AbstractConnectionClosedListener extends AbstractConnectionListener {
+
+    @Override
+    public final void connectionClosed() {
+        connectionTerminated();
+    }
+
+    @Override
+    public final void connectionClosedOnError(Exception e) {
+        connectionTerminated();
+    }
+
+    public abstract void connectionTerminated();
+}

smack-core/src/main/java/org/jivesoftware/smack/Roster.java

@@ -135,8 +135,9 @@ public class Roster {
         connection.addSyncPacketListener(presencePacketListener, PRESENCE_PACKET_FILTER);
 
         // Listen for connection events
-        connection.addConnectionListener(new AbstractConnectionListener() {
-            
+        connection.addConnectionListener(new AbstractConnectionClosedListener() {
+
+            @Override
             public void authenticated(XMPPConnection connection) {
                 // Anonymous users can't have a roster, but it is possible that a Roster instance is
                 // retrieved if getRoster() is called *before* connect(). So we have to check here
@@ -154,12 +155,8 @@ public class Roster {
                 }
             }
 
-            public void connectionClosed() {
-                // Changes the presence available contacts to unavailable
-                setOfflinePresencesAndResetLoaded();
-            }
-
-            public void connectionClosedOnError(Exception e) {
+            @Override
+            public void connectionTerminated() {
                 // Changes the presence available contacts to unavailable
                 setOfflinePresencesAndResetLoaded();
             }