fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure we delete the proper checked folders

This commit is contained in:
tibbi 2016-03-06 22:42:55 +01:00
parent b880912ecb
commit e4127b61d9
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
View File

@ -132,13 +132,17 @@ public class MainActivity extends AppCompatActivity
Helpers.showToast(this, R.string.deleting);
final SparseBooleanArray items = gridView.getCheckedItemPositions();
int cnt = items.size();
int deletedCnt = 0;
for (int i = 0; i < cnt; i++) {
final int id = items.keyAt(i);
final String path = dirs.get(id).getPath();
toBeDeleted.add(path);
if (items.valueAt(i)) {
final int id = items.keyAt(i);
final String path = dirs.get(id).getPath();
toBeDeleted.add(path);
deletedCnt++;
}
}
notifyDeletion(cnt);
notifyDeletion(deletedCnt);
}
private void notifyDeletion(int cnt) {
@ -168,13 +172,15 @@ public class MainActivity extends AppCompatActivity
final List<String> updatedFiles = new ArrayList<>();
for (String delPath : toBeDeleted) {
final File dir = new File(delPath);
final File[] files = dir.listFiles();
for (File f : files) {
updatedFiles.add(f.getAbsolutePath());
f.delete();
if (dir.exists()) {
final File[] files = dir.listFiles();
for (File f : files) {
updatedFiles.add(f.getAbsolutePath());
f.delete();
}
updatedFiles.add(dir.getAbsolutePath());
dir.delete();
}
updatedFiles.add(dir.getAbsolutePath());
dir.delete();
}
final String[] deletedPaths = updatedFiles.toArray(new String[updatedFiles.size()]);

12
app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java
View File

@ -149,13 +149,17 @@ public class PhotosActivity extends AppCompatActivity
Helpers.showToast(this, R.string.deleting);
final SparseBooleanArray items = gridView.getCheckedItemPositions();
int cnt = items.size();
int deletedCnt = 0;
for (int i = 0; i < cnt; i++) {
final int id = items.keyAt(i);
final String path = photos.get(id);
toBeDeleted.add(path);
if (items.valueAt(i)) {
final int id = items.keyAt(i);
final String path = photos.get(id);
toBeDeleted.add(path);
deletedCnt++;
}
}
notifyDeletion(cnt);
notifyDeletion(deletedCnt);
}
private void notifyDeletion(int cnt) {