upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-09-30 16:52:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

TrackList: Fix crashes in selection mode

Browse Source 
Fixes: #1711
This commit is contained in:
Leon Marz
2023-10-08 12:02:34 +02:00
committed by Dennis Guse
parent 8ca208a631
commit afbe94195c
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
+24 -22
View File
@@ -107,13 +107,14 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
@Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
selectionMode = true;
actionModeCallback.onPrepare(menu, getCheckedPositions(), getCheckedIds(), true);
actionModeCallback.onPrepare(menu, null, getCheckedIds(), true);
return true;
}
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
if (actionModeCallback.onClick(item.getItemId(), getCheckedPositions(), getCheckedIds())) {
if (actionModeCallback.onClick(item.getItemId(), null, getCheckedIds())) {
mode.finish();
}
return true;
@@ -124,37 +125,34 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
selectionMode = false;
setAllSelected(false);
selection.clear();
actionModeCallback.onDestroy();
}
public void setAllSelected(boolean isSelected) {
for (int i = 0; i < getItemCount(); i++) {
ViewHolder holder = (ViewHolder) recyclerView.findViewHolderForLayoutPosition(i);
if (isSelected) {
final int idIndex = tracks.getColumnIndexOrThrow(TracksColumns._ID);
tracks.moveToFirst();
do {
selection.put((int) tracks.getLong(idIndex), true);
} while (tracks.moveToNext());
} else {
selection.clear();
}
for (int i = 0; i < recyclerView.getChildCount(); i++) {
ViewHolder holder = (ViewHolder) recyclerView.getChildViewHolder(recyclerView.getChildAt(i));
holder.setSelected(isSelected);
}
}
private int[] getCheckedPositions() {
List<Integer> positions = new ArrayList<>();
for (int i = 0; i < selection.size(); i++) {
if (selection.valueAt(i)) {
positions.add(selection.keyAt(i));
}
}
return positions.stream().mapToInt(i -> i).toArray();
}
private long[] getCheckedIds() {
List<Long> ids = new ArrayList<>();
for (int i = 0; i < selection.size(); i++) {
if (selection.valueAt(i)) {
ViewHolder holder = (ViewHolder) recyclerView.findViewHolderForLayoutPosition(selection.keyAt(i));
ids.add(holder.getId());
ids.add((long) selection.keyAt(i));
}
}
@@ -251,7 +249,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
}
public void setSelected(boolean isSelected) {
selection.put(getLayoutPosition(), isSelected);
selection.put((int) getId(), isSelected);
view.setActivated(isSelected);
}
@@ -286,8 +284,12 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
@Override
public boolean onLongClick(View v) {
actionMode = context.startSupportActionMode(TrackListAdapter.this);
setSelected(true);
setSelected(!view.isActivated());
if (!selectionMode) {
actionMode = context.startSupportActionMode(TrackListAdapter.this);
} else {
actionMode.invalidate();
}
return true;
}
}