Skip to content

Commit 7def88e

Browse files
committed
multiselection bug solved
1 parent 90b8b70 commit 7def88e

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedApiAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public ArrayList<Integer> getSelectedPositions()
7979
{
8080
positions.add((Integer)key);
8181
}
82-
Collections.sort(positions);
82+
Collections.sort(positions,Collections.reverseOrder());
8383
return positions;
8484
}
8585

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedProjectAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public ArrayList<Integer> getSelectedPositions()
7474
{
7575
positions.add((Integer)key);
7676
}
77-
Collections.sort(positions);
77+
Collections.sort(positions, Collections.reverseOrder());
7878
return positions;
7979
}
8080

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ public void onClick(View v) {
343343
Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
344344
sendIntent.setType("application/zip");
345345
for(int selectedPosition : selectedPositions) {
346-
if(selectedPosition != selectedPositions.get(0))
347-
selectedPosition--;
348346
SavedApi apk = savedApis.get(selectedPosition);
349347
File file = new File(apk.getFile().getPath());
350348
Uri fileUri = Uri.fromFile(file);
@@ -440,13 +438,12 @@ private void deleteItems() {
440438
ArrayList<Integer> selectedPositions = mAdapter.getSelectedPositions();
441439
boolean deleted = false;
442440
for(int selectedPosition : selectedPositions) {
443-
if (selectedPosition != selectedPositions.get(0))
444-
selectedPosition--;
445441
SavedApi apk = savedApis.get(selectedPosition);
446442
File file = new File(apk.getFile().getPath());
447443
deleted = file.delete();
448444
if (deleted) {
449445
savedApis.remove(selectedPosition);
446+
mAdapter.removeSelectedPosition(selectedPosition);
450447
mAdapter.notifyDataSetChanged();
451448
setEmptyText();
452449
}

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,6 @@ public void onClick(View v) {
372372
Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
373373
sendIntent.setType("application/zip");
374374
for(int selectedPosition : selectedPositions) {
375-
if(selectedPosition != selectedPositions.get(0))
376-
selectedPosition--;
377375
SavedProject project = savedProjects.get(selectedPosition);
378376
File file = new File(project.getFile().getPath());
379377

@@ -471,11 +469,10 @@ private void deleteItems() {
471469
ArrayList<Integer> selectedPositions = mAdapter.getSelectedPositions();
472470
boolean deleted = false;
473471
for(int selectedPosition : selectedPositions) {
474-
if(selectedPosition!=selectedPositions.get(0))
475-
selectedPosition--;
476472
SavedProject project = savedProjects.get(selectedPosition);
477473
File file = new File(project.getFile().getPath());
478474
deleted = file.delete();
475+
479476
if (deleted) {
480477
savedProjects.remove(selectedPosition);
481478
mAdapter.removeSelectedPosition(selectedPosition);

0 commit comments

Comments
 (0)