From 2af8c4cab3bd3550ac51f4227318184234a5db36 Mon Sep 17 00:00:00 2001 From: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:57:17 +0100 Subject: [PATCH] Update to latest echo & fix browse recommendation --- .../echo/extension/clients/DeezerSearchClient.kt | 12 ++++++------ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/src/main/java/dev/brahmkshatriya/echo/extension/clients/DeezerSearchClient.kt b/ext/src/main/java/dev/brahmkshatriya/echo/extension/clients/DeezerSearchClient.kt index 632c7d2..0bf9bbb 100644 --- a/ext/src/main/java/dev/brahmkshatriya/echo/extension/clients/DeezerSearchClient.kt +++ b/ext/src/main/java/dev/brahmkshatriya/echo/extension/clients/DeezerSearchClient.kt @@ -22,9 +22,9 @@ class DeezerSearchClient(private val api: DeezerApi, private val history: Boolea @Volatile private var oldSearch: Pair>? = null - suspend fun quickSearch(query: String?): List { + suspend fun quickSearch(query: String): List { DeezerExtension().handleArlExpiration() - return if (query.isNullOrEmpty()) { + return if (query.isBlank()) { val queryList = mutableListOf() val jsonObject = api.getSearchHistory() val resultObject = jsonObject["results"]!!.jsonObject @@ -58,9 +58,9 @@ class DeezerSearchClient(private val api: DeezerApi, private val history: Boolea } } - fun searchFeed(query: String?, tab: Tab?): PagedData.Single = PagedData.Single { + fun searchFeed(query: String, tab: Tab?): PagedData.Single = PagedData.Single { DeezerExtension().handleArlExpiration() - query ?: return@Single browseFeed() + query.ifBlank { return@Single browseFeed() } if (history) { api.setSearchHistory(query) @@ -118,9 +118,9 @@ class DeezerSearchClient(private val api: DeezerApi, private val history: Boolea } } - suspend fun searchTabs(query: String?): List { + suspend fun searchTabs(query: String): List { DeezerExtension().handleArlExpiration() - query ?: return emptyList() + query.ifBlank { return emptyList() } val jsonObject = api.search(query) val resultObject = jsonObject["results"]?.jsonObject diff --git a/gradle.properties b/gradle.properties index ba94823..0992975 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ android.useAndroidX=true kotlin.code.style=official android.nonTransitiveRClass=true -libVersion=016505f4ed +libVersion=2552ee0c22 extType=music extId=deezer