From 8592fd5bf00261fa78abc63466e898125061f2e6 Mon Sep 17 00:00:00 2001 From: Hammad Tanveer Date: Sun, 15 Mar 2026 15:06:18 +0530 Subject: [PATCH] Remove redundant constructs in Kotlin files --- AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt | 2 +- .../main/java/com/ichi2/anki/deckpicker/DisplayDeckNode.kt | 7 +++---- .../anki/dialogs/SavedBrowserSearchesDialogFragment.kt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt index 18a972e96957..673dfd02e4a1 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt @@ -249,7 +249,7 @@ internal fun selectAnkiDroidFolder( return if (canManageExternalStorage) { AnkiDroidFolder.PublicFolder(PermissionSet.EXTERNAL_MANAGER) } else { - return AnkiDroidFolder.AppPrivateFolder + AnkiDroidFolder.AppPrivateFolder } } diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DisplayDeckNode.kt b/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DisplayDeckNode.kt index 9314530e6588..0ce239afa762 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DisplayDeckNode.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DisplayDeckNode.kt @@ -153,10 +153,9 @@ fun DeckNode.addVisibleToList(list: MutableList) { } @SuppressLint("LocaleRootUsage") -private fun DeckNode.nameMatchesFilter(filter: CharSequence?): Boolean { - return if (filter == null) { +private fun DeckNode.nameMatchesFilter(filter: CharSequence?): Boolean = + if (filter == null) { true } else { - return node.name.lowercase(Locale.getDefault()).contains(filter) || node.name.lowercase(Locale.ROOT).contains(filter) + node.name.lowercase(Locale.getDefault()).contains(filter) || node.name.lowercase(Locale.ROOT).contains(filter) } -} diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt index 2db326e7cae1..479b5d884a5f 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt @@ -168,7 +168,7 @@ fun CardBrowser.registerSavedSearchActionHandler(action: (Int, String?) -> Unit) this, ) { _, bundle -> val type = bundle.getInt(SavedBrowserSearchesDialogFragment.ARG_TYPE) - val searchName = bundle.getString(SavedBrowserSearchesDialogFragment.ARG_SAVED_SEARCH) + val searchName = bundle.getString(ARG_SAVED_SEARCH) Timber.d("On user saved search selection named: %s", searchName) action(type, searchName) }