From b2a6f2e7d983c9c4429a6c8044cfd7cc670ca345 Mon Sep 17 00:00:00 2001
From: Nguyen Duc Tuan Minh <minhnguyen.31211027595@st.ueh.edu.vn>
Date: Wed, 6 Nov 2024 23:54:57 +0700
Subject: [PATCH] Fix log in warning dialog and null exception

---
 .../com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt | 2 +-
 .../main/java/com/maxrave/simpmusic/viewModel/HomeViewModel.kt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt b/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt
index b17dc5c4..e0d8346a 100644
--- a/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt
@@ -1516,7 +1516,7 @@ class SimpleMediaServiceHandler(
                 listTracks = arrayListOf(),
             )
         }
-        val current = if (index != null) tempQueue[index] else null
+        val current = if (index != null) tempQueue.getOrNull(index) else null
         chunkedList.forEach { list ->
             val catalogMetadata: ArrayList<Track> = arrayListOf()
             Log.w("SimpleMediaServiceHandler", "Catalog size: ${tempQueue.size}")
diff --git a/app/src/main/java/com/maxrave/simpmusic/viewModel/HomeViewModel.kt b/app/src/main/java/com/maxrave/simpmusic/viewModel/HomeViewModel.kt
index 8b6f3f05..99ca9207 100644
--- a/app/src/main/java/com/maxrave/simpmusic/viewModel/HomeViewModel.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/viewModel/HomeViewModel.kt
@@ -7,7 +7,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.offline.Download
-import com.maxrave.kotlinytmusicscraper.YouTube
 import com.maxrave.simpmusic.R
 import com.maxrave.simpmusic.common.DownloadState
 import com.maxrave.simpmusic.common.SELECTED_LANGUAGE
@@ -87,7 +86,7 @@ class HomeViewModel(
     val showLogInAlert: StateFlow<Boolean> = _showLogInAlert
 
     init {
-        if (YouTube.cookie.isNullOrEmpty()) {
+        if (runBlocking{ dataStoreManager.cookie.first() }.isEmpty()) {
             _showLogInAlert.update { true }
         }
         homeJob = Job()