Fixed: Folder.clear fails to remove empty subfolders on Android

Resolves #1945
This commit is contained in:
Rossen Hristov
2016-04-26 17:37:26 +03:00
parent 7caeae0285
commit 872e97e895
2 changed files with 17 additions and 2 deletions

View File

@@ -462,8 +462,6 @@ export var testFolderClear = function () {
folder.getFile("Test1.txt");
folder.getFile("Test2.txt");
var subfolder = folder.getFolder("subfolder");
subfolder.getFile("Test3.txt");
subfolder.getFile("Test4.txt");
var emptied;
// << (hide)
folder.clear()
@@ -549,3 +547,17 @@ export function test_CreateParentOnNewFile(done) {
}).then(() => done())
.catch(done);
}
export function test_FolderClear_RemovesEmptySubfolders(done) {
let documents = fs.knownFolders.documents();
let rootFolder = documents.getFolder("rootFolder");
let emptySubfolder = rootFolder.getFolder("emptySubfolder");
TKUnit.assertTrue(fs.Folder.exists(emptySubfolder.path), "emptySubfolder should exist before parent folder is cleared.");
rootFolder.clear().then(
() => {
TKUnit.assertFalse(fs.File.exists(emptySubfolder.path), "emptySubfolder should not exist after parent folder was cleared.");
rootFolder.remove();
done();
})
.catch(done);
}

View File

@@ -300,6 +300,9 @@ export class FileSystemAccess {
private deleteFolderContent(file: java.io.File): boolean {
var filesList = file.listFiles();
if (filesList.length === 0) {
return true;// Nothing to delete, so success!
}
var i,
childFile: java.io.File,