From 005aea4e5f755c5af7ee6102c0dbe643d527a756 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Thu, 5 Jan 2023 22:32:12 +0100
Subject: [PATCH] Fix thread safety for drawer onClose

---
 .../java/com/github/gotify/messages/MessagesActivity.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/java/com/github/gotify/messages/MessagesActivity.kt
index 6917e74..1d28b05 100644
--- a/app/src/main/java/com/github/gotify/messages/MessagesActivity.kt
+++ b/app/src/main/java/com/github/gotify/messages/MessagesActivity.kt
@@ -128,11 +128,11 @@ internal class MessagesActivity :
         binding.drawerLayout.addDrawerListener(
             object : SimpleDrawerListener() {
                 override fun onDrawerClosed(drawerView: View) {
-                    if (updateAppOnDrawerClose != null) {
-                        viewModel.appId = updateAppOnDrawerClose!!
+                    updateAppOnDrawerClose?.let { selectApp ->
+                        updateAppOnDrawerClose = null
+                        viewModel.appId = selectApp
                         launchCoroutine {
-                            updateMessagesForApplication(true, updateAppOnDrawerClose!!)
-                            updateAppOnDrawerClose = null
+                            updateMessagesForApplication(true, selectApp)
                         }
                         invalidateOptionsMenu()
                     }