From f327906a3e2216f855ba22ac982d088069d9ee50 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:54:57 +0100 Subject: [PATCH] Make file plugin config parameter non-optional, remove unused field --- .../de/mm20/launcher2/plugin/config/SearchPluginConfig.kt | 6 ------ .../main/java/de/mm20/launcher2/sdk/files/FileProvider.kt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt index 4f68e856..ea466990 100644 --- a/core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt +++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt @@ -4,10 +4,6 @@ import android.os.Bundle import de.mm20.launcher2.plugin.config.StorageStrategy data class SearchPluginConfig( - /** - * Icon resource to indicate that a result is from this provider - */ - val providerIconRes: Int? = null, /** * Strategy to store items from this provider in the launcher database * @see [StorageStrategy] @@ -16,7 +12,6 @@ data class SearchPluginConfig( ) { fun toBundle(): Bundle { return Bundle().apply { - putInt("providerIconRes", providerIconRes ?: 0) putString("storageStrategy", storageStrategy.name) } } @@ -24,7 +19,6 @@ data class SearchPluginConfig( companion object { operator fun invoke(bundle: Bundle): SearchPluginConfig? { return SearchPluginConfig( - providerIconRes = bundle.getInt("providerIconRes", 0).takeIf { it != 0 }, storageStrategy = StorageStrategy.valueOfOrElse( bundle.getString( "storageStrategy", diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt index 63ac8c46..ab85cde2 100644 --- a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt +++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt @@ -7,7 +7,7 @@ import de.mm20.launcher2.plugin.contracts.FilePluginContract import de.mm20.launcher2.sdk.base.SearchPluginProvider abstract class FileProvider( - config: SearchPluginConfig = SearchPluginConfig(), + config: SearchPluginConfig, ) : SearchPluginProvider(config) { abstract override suspend fun search(query: String): List