Prevent swipe actions on the 'Pinned' header.

signalapp · Aug 17, 2020 · bdd298c · bdd298c
1 parent 3f7dd21
commit bdd298c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -256,7 +256,7 @@ private static class PlaceholderViewHolder extends RecyclerView.ViewHolder {
     }
   }
 
-  private static class HeaderViewHolder extends RecyclerView.ViewHolder {
+  static class HeaderViewHolder extends RecyclerView.ViewHolder {
     private TextView headerText;
 
     public HeaderViewHolder(@NonNull View itemView) {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -1022,8 +1022,9 @@ public boolean onMove(@NonNull RecyclerView recyclerView,
 
     @Override
     public int getSwipeDirs(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-      if (viewHolder.itemView instanceof ConversationListItemAction ||
-          actionMode != null                                        ||
+      if (viewHolder.itemView instanceof ConversationListItemAction      ||
+          viewHolder instanceof ConversationListAdapter.HeaderViewHolder ||
+          actionMode != null                                             ||
           activeAdapter == searchAdapter)
       {
         return 0;