Report active user even if session is not active (#210)

librespot-org · Apr 22, 2020 · c03316a · c03316a
1 parent 373e389
commit c03316a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/src/main/java/xyz/gianlu/librespot/core/ZeroconfServer.java b/core/src/main/java/xyz/gianlu/librespot/core/ZeroconfServer.java
@@ -221,8 +221,8 @@ public void closeSession() throws IOException {
         connectionTime = 0;
     }
 
-    private boolean hasActiveSession() {
-        boolean valid = session != null && session.isValid() && session.isActive();
+    private boolean hasValidSession() {
+        boolean valid = session != null && session.isValid();
         if (!valid) {
             session = null;
             connectionTime = 0;
@@ -231,9 +231,13 @@ private boolean hasActiveSession() {
         return valid;
     }
 
+    private boolean hasActiveSession() {
+        return hasValidSession() && session.isActive();
+    }
+
     private void handleGetInfo(OutputStream out, String httpVersion) throws IOException {
         JsonObject info = DEFAULT_GET_INFO_FIELDS.deepCopy();
-        info.addProperty("activeUser", hasActiveSession() ? session.username() : "");
+        info.addProperty("activeUser", hasValidSession() ? session.username() : "");
         info.addProperty("deviceID", inner.deviceId);
         info.addProperty("remoteName", inner.deviceName);
         info.addProperty("publicKey", Base64.getEncoder().encodeToString(keys.publicKeyArray()));