From 5691088787e4e27ec5fde7caeef8e87f4d980481 Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Mon, 21 Sep 2020 17:41:25 -0700 Subject: [PATCH] For #15286: Don't crash when separators are long-touched --- .../mozilla/fenix/library/bookmarks/BookmarkTouchHelper.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkTouchHelper.kt index 742f2a238..5edf2c26f 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkTouchHelper.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkTouchHelper.kt @@ -30,8 +30,12 @@ class BookmarkTouchCallback( recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder ): Int { + // Swiping separators is currently not supported. + if (viewHolder is BookmarkSeparatorViewHolder) { + return 0 + } val item = (viewHolder as BookmarkNodeViewHolder).item - return if (viewHolder is BookmarkSeparatorViewHolder || item?.inRoots() == true) { + return if (item?.inRoots() == true) { 0 } else { super.getSwipeDirs(recyclerView, viewHolder)