Merge branch 'multiselect_bug' of git://github.com/codingblazer/BuildmLearn-Toolkit-Android into codingblazer-multiselect_bug

Author: opticod

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

@@ -79,7 +79,7 @@ public ArrayList<Integer> getSelectedPositions()
         {
             positions.add((Integer)key);
         }
-        Collections.sort(positions);
+        Collections.sort(positions,Collections.reverseOrder());
         return positions;
     }
 

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

@@ -74,7 +74,7 @@ public ArrayList<Integer> getSelectedPositions()
         {
             positions.add((Integer)key);
         }
-        Collections.sort(positions);
+        Collections.sort(positions, Collections.reverseOrder());
         return positions;
     }
 

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

@@ -332,8 +332,6 @@ public void onClick(View v) {
                 Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
                 sendIntent.setType("application/zip");
                 for(int selectedPosition : selectedPositions) {
-                    if(selectedPosition != selectedPositions.get(0))
-                        selectedPosition--;
                     SavedApi apk = savedApis.get(selectedPosition);
                     File file = new File(apk.getFile().getPath());
                     Uri fileUri = Uri.fromFile(file);
@@ -429,13 +427,12 @@ private void deleteItems() {
         ArrayList<Integer> selectedPositions = mAdapter.getSelectedPositions();
         boolean deleted = false;
         for(int selectedPosition : selectedPositions) {
-            if (selectedPosition != selectedPositions.get(0))
-                selectedPosition--;
             SavedApi apk = savedApis.get(selectedPosition);
             File file = new File(apk.getFile().getPath());
             deleted = file.delete();
             if (deleted) {
                 savedApis.remove(selectedPosition);
+                mAdapter.removeSelectedPosition(selectedPosition);
                 mAdapter.notifyDataSetChanged();
                 setEmptyText();
             }

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

@@ -370,8 +370,6 @@ public void onClick(View v) {
                 Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
                 sendIntent.setType("application/zip");
                 for(int selectedPosition : selectedPositions) {
-                    if(selectedPosition != selectedPositions.get(0))
-                        selectedPosition--;
                     SavedProject project = savedProjects.get(selectedPosition);
                     File file = new File(project.getFile().getPath());
 
@@ -469,11 +467,10 @@ private void deleteItems() {
         ArrayList<Integer> selectedPositions = mAdapter.getSelectedPositions();
         boolean deleted = false;
         for(int selectedPosition : selectedPositions) {
-            if(selectedPosition!=selectedPositions.get(0))
-                selectedPosition--;
             SavedProject project = savedProjects.get(selectedPosition);
             File file = new File(project.getFile().getPath());
             deleted = file.delete();
+
             if (deleted) {
                 savedProjects.remove(selectedPosition);
                 mAdapter.removeSelectedPosition(selectedPosition);