Remove unnecessary CustomLinearLayoutManager

Remove CustomLinearLayoutManager, a workaround for an old bug in the RecyclerView library and which is no longer necessary. This change was added back in 2019: MozillaReality/FirefoxReality#1879 A comment in the code explained the issue: > There seems to be a bug in the RecyclerView adapter that > makes it crash sometimes when updating the dataset. This > seems to be the only thing that works until there is > a new RecyclerView version > 1.0.0 that fixes it. We are already using version 1.3.2 of the RecyclerView library and the crash seems to be long gone.
Igalia · Oct 25, 2024 · 3bec278 · 3bec278
1 parent f548135
commit 3bec278
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 45 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/adapters/CustomLinearLayoutManager.java b/app/src/common/shared/com/igalia/wolvic/ui/adapters/CustomLinearLayoutManager.java
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/views/library/BookmarksView.java b/app/src/common/shared/com/igalia/wolvic/ui/views/library/BookmarksView.java
@@ -33,7 +33,6 @@
 import com.igalia.wolvic.telemetry.TelemetryService;
 import com.igalia.wolvic.ui.adapters.Bookmark;
 import com.igalia.wolvic.ui.adapters.BookmarkAdapter;
-import com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager;
 import com.igalia.wolvic.ui.callbacks.BookmarkItemCallback;
 import com.igalia.wolvic.ui.callbacks.BookmarksCallback;
 import com.igalia.wolvic.ui.callbacks.LibraryContextMenuCallback;
@@ -69,7 +68,7 @@ public class BookmarksView extends LibraryView implements BookmarksStore.Bookmar
     private BookmarksBinding mBinding;
     private Accounts mAccounts;
     private BookmarkAdapter mBookmarkAdapter;
-    private CustomLinearLayoutManager mLayoutManager;
+    private LinearLayoutManager mLayoutManager;
     private BookmarksViewModel mViewModel;
     private List<BookmarkNode> mCachedBookmarkItems;
 
@@ -124,7 +123,7 @@ public void updateUI() {
             mBinding.bookmarksList.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
         }
 
-        mLayoutManager = (CustomLinearLayoutManager) mBinding.bookmarksList.getLayoutManager();
+        mLayoutManager = (LinearLayoutManager) mBinding.bookmarksList.getLayoutManager();
 
         mViewModel.setIsLoading(true);
 

diff --git a/app/src/main/res/layout/addon_options_permissions.xml b/app/src/main/res/layout/addon_options_permissions.xml
@@ -38,7 +38,7 @@
                         android:paddingEnd="20dp"
                         android:fadingEdgeLength="60dp"
                         android:requiresFadingEdge="vertical"
-                        app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"/>
+                        app:layoutManager="LinearLayoutManager"/>
                     <TextView
                         android:id="@+id/learn_more_link"
                         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/addons_list.xml b/app/src/main/res/layout/addons_list.xml
@@ -35,7 +35,7 @@
             android:orientation="vertical"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"
+            app:layoutManager="LinearLayoutManager"
             app:visibleGone="@{!viewModel.isLoading}" />
 
     </com.igalia.wolvic.ui.views.ScrollBlockingLayout>

diff --git a/app/src/main/res/layout/bookmarks.xml b/app/src/main/res/layout/bookmarks.xml
@@ -106,7 +106,7 @@
             android:contentDescription="Bookmarks feed"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"
+            app:layoutManager="LinearLayoutManager"
             app:visibleGone="@{!bookmarksViewModel.isLoading &amp;&amp; !bookmarksViewModel.isEmpty}" />
 
         <FrameLayout

diff --git a/app/src/main/res/layout/downloads.xml b/app/src/main/res/layout/downloads.xml
@@ -82,7 +82,7 @@
             android:contentDescription="Downloads"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"
+            app:layoutManager="LinearLayoutManager"
             app:visibleGone="@{!downloadsViewModel.isLoading &amp;&amp; !downloadsViewModel.isEmpty}" />
 
         <FrameLayout

diff --git a/app/src/main/res/layout/hamburger_menu.xml b/app/src/main/res/layout/hamburger_menu.xml
@@ -22,7 +22,7 @@
             android:listSelector="@null"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"/>
+            app:layoutManager="LinearLayoutManager"/>
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="30dp"

diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml
@@ -102,7 +102,7 @@
             android:contentDescription="History feed"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"
+            app:layoutManager="LinearLayoutManager"
             app:visibleGone="@{!historyViewModel.isLoading &amp;&amp; !historyViewModel.isEmpty}" />
 
         <FrameLayout

diff --git a/app/src/main/res/layout/options_exceptions.xml b/app/src/main/res/layout/options_exceptions.xml
@@ -91,7 +91,7 @@
                     android:layout_height="match_parent"
                     android:contentDescription="privacy_options_popups_list_header_v1"
                     android:paddingEnd="15dp"
-                    app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager" />
+                    app:layoutManager="LinearLayoutManager" />
             </LinearLayout>
         </FrameLayout>
 

diff --git a/app/src/main/res/layout/options_language_content.xml b/app/src/main/res/layout/options_language_content.xml
@@ -53,7 +53,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:contentDescription="@string/app_name"
-                    app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager" />
+                    app:layoutManager="LinearLayoutManager" />
             </LinearLayout>
 
             <LinearLayout
@@ -77,7 +77,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:contentDescription="@string/app_name"
-                    app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager" />
+                    app:layoutManager="LinearLayoutManager" />
             </LinearLayout>
         </LinearLayout>
 

diff --git a/app/src/main/res/layout/options_saved_logins.xml b/app/src/main/res/layout/options_saved_logins.xml
@@ -92,7 +92,7 @@
                     android:background="@color/asphalt"
                     android:contentDescription="Logins List"
                     android:paddingEnd="15dp"
-                    app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager" />
+                    app:layoutManager="LinearLayoutManager" />
             </LinearLayout>
         </FrameLayout>
 

diff --git a/app/src/main/res/layout/prompt_file.xml b/app/src/main/res/layout/prompt_file.xml
@@ -77,7 +77,7 @@
             android:minHeight="400dp"
             android:requiresFadingEdge="vertical"
             android:smoothScrollbar="true"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"
+            app:layoutManager="LinearLayoutManager"
             app:visibleGone="@{!isEmpty}" />
 
         <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/prompt_select_login.xml b/app/src/main/res/layout/prompt_select_login.xml
@@ -42,7 +42,7 @@
             android:contentDescription="Saved Logins list"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager" />
+            app:layoutManager="LinearLayoutManager" />
 
         <RelativeLayout
             android:id="@+id/buttonsLayout"

diff --git a/app/src/main/res/layout/system_notifications.xml b/app/src/main/res/layout/system_notifications.xml
@@ -67,7 +67,7 @@
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
             app:visibleGone="@{!notificationsViewModel.isLoading &amp;&amp; !notificationsViewModel.isEmpty}"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager" />
+            app:layoutManager="LinearLayoutManager" />
 
         <FrameLayout
             android:id="@+id/header"

diff --git a/app/src/main/res/layout/webapps.xml b/app/src/main/res/layout/webapps.xml
@@ -82,7 +82,7 @@
             android:contentDescription="@string/web_apps_title"
             android:fadingEdgeLength="60dp"
             android:requiresFadingEdge="vertical"
-            app:layoutManager="com.igalia.wolvic.ui.adapters.CustomLinearLayoutManager"
+            app:layoutManager="LinearLayoutManager"
             app:visibleGone="@{!webAppsViewModel.isLoading &amp;&amp; !webAppsViewModel.isEmpty}" />
 
     </RelativeLayout>