Dispatch session closing when using Zeroconf

Author: devgianlu

api/src/main/java/xyz/gianlu/librespot/api/PlayerWrapper.java

@@ -31,7 +31,18 @@ private PlayerWrapper(@NotNull PlayerConfiguration conf) {
     @NotNull
     public static PlayerWrapper fromZeroconf(@NotNull ZeroconfServer server, @NotNull PlayerConfiguration conf) {
         PlayerWrapper wrapper = new PlayerWrapper(conf);
-        server.addSessionListener(wrapper::set);
+        server.addSessionListener(new ZeroconfServer.SessionListener() {
+            @Override
+            public void sessionClosing(@NotNull Session session) {
+                if (wrapper.getSession() == session)
+                    wrapper.clear();
+            }
+
+            @Override
+            public void sessionChanged(@NotNull Session session) {
+                wrapper.set(session);
+            }
+        });
         return wrapper;
     }
 

api/src/main/java/xyz/gianlu/librespot/api/SessionWrapper.java

@@ -26,7 +26,18 @@ protected SessionWrapper() {
     @NotNull
     public static SessionWrapper fromZeroconf(@NotNull ZeroconfServer server) {
         SessionWrapper wrapper = new SessionWrapper();
-        server.addSessionListener(wrapper::set);
+        server.addSessionListener(new ZeroconfServer.SessionListener() {
+            @Override
+            public void sessionClosing(@NotNull Session session) {
+                if (wrapper.getSession() == session)
+                    wrapper.clear();
+            }
+
+            @Override
+            public void sessionChanged(@NotNull Session session) {
+                wrapper.set(session);
+            }
+        });
         return wrapper;
     }
 

lib/src/main/java/xyz/gianlu/librespot/ZeroconfServer.java

@@ -201,6 +201,8 @@ public void close() throws IOException {
     }
 
     public void closeSession() throws IOException {
+        sessionListeners.forEach(l -> l.sessionClosing(session));
+
         if (session != null) session.close();
         session = null;
     }
@@ -377,6 +379,18 @@ public void removeSessionListener(@NotNull SessionListener listener) {
     }
 
     public interface SessionListener {
+        /**
+         * The session instance is going to be closed after this call.
+         *
+         * @param session The old {@link Session}
+         */
+        void sessionClosing(@NotNull Session session);
+
+        /**
+         * The session instance changed. {@link #sessionClosing(Session)} has been already called.
+         *
+         * @param session The new {@link Session}
+         */
         void sessionChanged(@NotNull Session session);
     }
 

player/src/main/java/xyz/gianlu/librespot/player/Main.java

@@ -33,8 +33,12 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept
                 }
 
                 @Override
-                public void sessionChanged(@NotNull Session session) {
+                public void sessionClosing(@NotNull Session session) {
                     if (lastPlayer != null) lastPlayer.close();
+                }
+
+                @Override
+                public void sessionChanged(@NotNull Session session) {
                     lastPlayer = new Player(conf.toPlayer(), session);
                 }
             });