diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java index 5a50c9ffd..db81fc2ab 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java @@ -48,7 +48,6 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder { public NoteViewHolder(@NonNull View v, @NonNull NoteClickListener noteClickListener) { super(v); this.noteClickListener = noteClickListener; - this.setIsRecyclable(false); this.dateFormatter = new DateFormatter(v.getContext()); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java index 477f3acbf..8013775f3 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java @@ -79,14 +79,12 @@ public int getSwipeDirs(@NonNull RecyclerView recyclerView, @NonNull RecyclerVie public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) { switch (direction) { case ItemTouchHelper.LEFT -> { - viewHolder.setIsRecyclable(false); final var note = (Note) adapter.getItem(viewHolder.getLayoutPosition()); tracker.deselect(note.getId()); Log.v(TAG, "Item deleted through swipe ----------------------------------------------"); deleteNoteWithUndo(context, mainViewModel, lifecycleOwner, view, anchorView, note.getId()); } case ItemTouchHelper.RIGHT -> { - viewHolder.setIsRecyclable(false); final var adapterNote = (Note) adapter.getItem(viewHolder.getLayoutPosition()); final var toggleLiveData = mainViewModel.toggleFavoriteAndSync(adapterNote); toggleLiveData.observe(lifecycleOwner, (next) -> toggleLiveData.removeObservers(lifecycleOwner)); diff --git a/app/src/test/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolderTest.kt b/app/src/test/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolderTest.kt new file mode 100644 index 000000000..b157e120e --- /dev/null +++ b/app/src/test/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolderTest.kt @@ -0,0 +1,41 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package it.niedermann.owncloud.notes.main.items.list + +import android.content.Context +import android.view.ContextThemeWrapper +import android.view.LayoutInflater +import androidx.test.core.app.ApplicationProvider +import com.nextcloud.android.common.core.utils.DateFormatter +import it.niedermann.owncloud.notes.R +import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithExcerptBinding +import it.niedermann.owncloud.notes.shared.model.NoteClickListener +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.mock +import org.mockito.Mockito.mockConstruction +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [36]) +class NoteViewListHolderTest { + + /** + * Rows that are not recyclable stay in the list after their note is removed. + */ + @Test + fun isRecyclable() { + val context = ContextThemeWrapper(ApplicationProvider.getApplicationContext(), R.style.AppTheme) + val binding = ItemNotesListNoteItemWithExcerptBinding.inflate(LayoutInflater.from(context)) + mockConstruction(DateFormatter::class.java).use { + val holder = NoteViewListHolder(binding, mock(NoteClickListener::class.java)) + assertTrue(holder.isRecyclable) + } + } +}