commit 071eeb3b2d24fa324a1769178ea1739c3d5ed780 parent 8cb97b84e630b90ab61aeb765e8487ef221161b1 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Wed, 24 Dec 2025 15:50:06 +0000 Bug 1997078 - Fix non-local return in createMovePairs. r=android-reviewers,mcarare w: Return in function with expression body and without explicit return type. Use block body '{...}' or add an explicit return type. This will become an error in language version 2.4. See https://youtrack.jetbrains.com/issue/KTLC-288. Differential Revision: https://phabricator.services.mozilla.com/D277194 Diffstat:
| M | mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksMiddleware.kt | | | 12 | ++++++------ |
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksMiddleware.kt @@ -711,12 +711,12 @@ private suspend fun BookmarksStorage.hasDesktopBookmarks(): Boolean { ) > 0u } -private fun BookmarksState.createMovePairs() = bookmarksMultiselectMoveState?.let { moveState -> - moveState.guidsToMove.map { guid -> - val bookmarkItem = bookmarkItems.firstOrNull { it.guid == guid } - if (bookmarkItem == null) { - return null - } +private fun BookmarksState.createMovePairs(): List<Pair<String, BookmarkInfo>>? { + val moveState = bookmarksMultiselectMoveState ?: return null + + return moveState.guidsToMove.mapNotNull { guid -> + val bookmarkItem = bookmarkItems.firstOrNull { it.guid == guid } ?: return@mapNotNull null + guid to BookmarkInfo( moveState.destination, // Setting position to 'null' is treated as a 'move to the end' by the storage API.