From 7583b0a3588af4b6e5d1393960ccd43037559ed4 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 20 Nov 2020 15:17:35 +0100
Subject: [PATCH] Fix rebase

---
 .../im/vector/app/features/userdirectory/UserListFragment.kt  | 4 ++--
 vector/src/main/res/layout/fragment_user_list.xml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
index 4af16772b8..0aad6dbe51 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
@@ -93,7 +93,7 @@ class UserListFragment @Inject constructor(
     }
 
     override fun onDestroyView() {
-        recyclerView.cleanup()
+        userListRecyclerView.cleanup()
         super.onDestroyView()
     }
 
@@ -115,7 +115,7 @@ class UserListFragment @Inject constructor(
     private fun setupRecyclerView() {
         userListController.callback = this
         // Don't activate animation as we might have way to much item animation when filtering
-        recyclerView.configureWith(userListController, disableItemAnimation = true)
+        userListRecyclerView.configureWith(userListController, disableItemAnimation = true)
     }
 
     private fun setupSearchView() {
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index a5210ed99a..b2bb9a909c 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -122,7 +122,7 @@
             tools:visibility="visible" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/knownUsersRecyclerView"
+            android:id="@+id/userListRecyclerView"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:fastScrollEnabled="true"