Fix issue with app state

Author: onoderis

src/main/kotlin/failchat/AppStateManager.kt

@@ -88,7 +88,10 @@ class AppStateManager(private val kodein: DKodein) {
     private var state: AppState = SETTINGS
 
     fun startChat(): Unit = lock.withLock {
-        if (state != SETTINGS) throw IllegalStateException("Expected: $SETTINGS, actual: $state")
+        if (state != SETTINGS) {
+            throw IllegalStateException("Expected: $SETTINGS, actual: $state")
+        }
+        state = CHAT
 
         val viewersCountLoaders: MutableList<ViewersCountLoader> = ArrayList()
         val initializedChatClients: MutableMap<Origin, ChatClient> = enumMap()
@@ -206,7 +209,11 @@ class AppStateManager(private val kodein: DKodein) {
     }
 
     fun stopChat(): Unit = lock.withLock {
-        if (state != CHAT) throw IllegalStateException("Expected: $CHAT, actual: $state")
+        if (state != CHAT) {
+            throw IllegalStateException("Expected: $CHAT, actual: $state")
+        }
+        state = SETTINGS
+
         reset()
 
         // Save config

src/main/kotlin/failchat/gui/FullGuiEventHandler.kt

@@ -6,6 +6,7 @@ import failchat.chat.ChatMessageSender
 import failchat.util.LateinitVal
 import failchat.util.completedFuture
 import failchat.util.executeWithCatch
+import failchat.util.logException
 import javafx.application.Platform
 import org.apache.commons.configuration2.Configuration
 import java.util.concurrent.CompletableFuture
@@ -29,9 +30,11 @@ class FullGuiEventHandler(
             it.chatFrame.show()
         }
 
-        guiTransitionFuture.whenCompleteAsync(BiConsumer { _, _ ->
-            appStateManager.startChat()
-        }, executor)
+        guiTransitionFuture
+                .whenCompleteAsync(BiConsumer { _, _ ->
+                    appStateManager.startChat()
+                }, executor)
+                .logException()
     }
 
     override fun handleStopChat() {
@@ -40,9 +43,11 @@ class FullGuiEventHandler(
             it.settingsFrame.show()
         }
 
-        guiTransitionFuture.whenCompleteAsync(BiConsumer { _, _ ->
-            appStateManager.stopChat()
-        }, executor)
+        guiTransitionFuture
+                .whenCompleteAsync(BiConsumer { _, _ ->
+                    appStateManager.stopChat()
+                }, executor)
+                .logException()
     }
 
     override fun handleShutDown() {

src/main/kotlin/failchat/util/CompletableFutures.kt

@@ -4,6 +4,7 @@ import mu.KotlinLogging
 import java.time.Duration
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionException
+import java.util.concurrent.CompletionStage
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 
@@ -36,9 +37,9 @@ fun Throwable.completionCause(): Throwable {
 
 private class NullCompletionCauseException(e: CompletionException) : Exception(e)
 
-fun <T> CompletableFuture<T>.logException() {
+fun <T> CompletionStage<T>.logException() {
     whenComplete { _, t ->
-        if (t !== null) logger.error("Unhandled exception from CompletableFuture", t)
+        if (t !== null) logger.error("Unhandled exception from CompletionStage", t)
     }
 }
 

src/main/kotlin/failchat/youtube/YoutubeChatClient.kt

@@ -62,6 +62,7 @@ class YoutubeChatClient(
         if (!statusChanged) {
             error("Chat client status: ${atomicStatus.value}")
         }
+        logger.info { "Starting youtube client" }
 
         val job = launch {
             val initialParameters = youtubeClient.getNewLiveChatSessionData(videoId)
@@ -109,6 +110,7 @@ class YoutubeChatClient(
     }
 
     override fun stop() {
+        logger.info { "Stopping youtube client" }
         cancel()
         atomicStatus.value = ChatClientStatus.OFFLINE
     }