From 078843675be291afa9ab6e2e8ddae8a4ca1bd028 Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Fri, 18 Sep 2020 20:51:08 -0700 Subject: [PATCH] For #15211: Make sure bookmarks are moved to the end of folders --- .../fenix/library/bookmarks/edit/EditBookmarkFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index a2375e02c..b74e52107 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -231,15 +231,17 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) { components.analytics.metrics.track(Event.EditedBookmark) } val parentGuid = sharedViewModel.selectedFolder?.guid ?: bookmarkNode!!.parentGuid + val parentChanged = initialParentGuid != parentGuid // Only track the 'moved' event if new parent was selected. - if (initialParentGuid != parentGuid) { + if (parentChanged) { components.analytics.metrics.track(Event.MovedBookmark) } components.core.bookmarksStorage.updateNode( args.guidToEdit, BookmarkInfo( parentGuid, - bookmarkNode?.position, + // Setting position to 'null' is treated as a 'move to the end' by the storage API. + if (parentChanged) null else bookmarkNode?.position, title, if (bookmarkNode?.type == BookmarkNodeType.ITEM) url else null )