From a3d320bb79924d9a8a1632730b332b0954e23df8 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 8 Apr 2022 21:54:43 +0500
Subject: [PATCH] Fix logout button

---
 .../kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt   | 8 ++------
 .../mealient/ui/activity/MainActivityViewModel.kt         | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt
index 49bc744..ec5ab65 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt
@@ -26,9 +26,7 @@ class AuthStorageImpl @Inject constructor(
             .distinctUntilChanged()
     private val singleThreadDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
 
-    override suspend fun setAuthHeader(authHeader: String?) {
-        putString(AUTH_HEADER_KEY, authHeader)
-    }
+    override suspend fun setAuthHeader(authHeader: String?) = putString(AUTH_HEADER_KEY, authHeader)
 
     override suspend fun getAuthHeader(): String? = getString(AUTH_HEADER_KEY)
 
@@ -45,9 +43,7 @@ class AuthStorageImpl @Inject constructor(
         value: String?
     ) = withContext(singleThreadDispatcher) {
         Timber.v("putString() called with: key = $key, value = $value")
-        sharedPreferences.edit {
-            value?.let { putString(key, value) } ?: remove(key)
-        }
+        sharedPreferences.edit(commit = true) { putString(key, value) }
     }
 
     private suspend fun getString(key: String) = withContext(singleThreadDispatcher) {
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
index 34fdf1e..6815084 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
@@ -1,5 +1,6 @@
 package gq.kirmanak.mealient.ui.activity
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
@@ -25,7 +26,8 @@ class MainActivityViewModel @Inject constructor(
         authRepo.isAuthorizedFlow,
         AuthenticationState::determineState
     )
-    val authenticationStateLive = authenticationStateFlow.asLiveData()
+    val authenticationStateLive: LiveData<AuthenticationState>
+        get() = authenticationStateFlow.asLiveData()
 
     fun logout() {
         Timber.v("logout() called")