mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-17 21:01:34 +08:00
Fix: Deleteing known folder should resolve as error
This commit is contained in:
@ -565,3 +565,17 @@ export var testKnownFolderRename = function () {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export function testKnownFolderRemove(done) {
|
||||||
|
var result;
|
||||||
|
|
||||||
|
var knownFolder = fs.knownFolders.temp();
|
||||||
|
|
||||||
|
knownFolder.remove().then(
|
||||||
|
function () {
|
||||||
|
done(new Error("Remove known folder should resolve as error."));
|
||||||
|
},
|
||||||
|
function (error) {
|
||||||
|
done(null);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
@ -125,10 +125,17 @@ export class FileSystemAccess {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isKnown) {
|
||||||
|
if (onError) {
|
||||||
|
onError({ message: "Cannot delete known folder." });
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Asynchronous
|
// TODO: Asynchronous
|
||||||
this.deleteFolderContent(javaFile);
|
this.deleteFolderContent(javaFile);
|
||||||
|
|
||||||
if (!isKnown) {
|
|
||||||
if (javaFile.delete()) {
|
if (javaFile.delete()) {
|
||||||
if (onSuccess) {
|
if (onSuccess) {
|
||||||
onSuccess();
|
onSuccess();
|
||||||
@ -138,9 +145,7 @@ export class FileSystemAccess {
|
|||||||
onError({ message: "Folder deletion failed." });
|
onError({ message: "Folder deletion failed." });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
// TODO: Notify error?
|
|
||||||
}
|
|
||||||
} catch (exception) {
|
} catch (exception) {
|
||||||
if (onError) {
|
if (onError) {
|
||||||
onError(exception);
|
onError(exception);
|
||||||
|
@ -176,6 +176,14 @@ export class FileSystemAccess {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public deleteFolder(path: string, isKnown?: boolean, onSuccess?: () => any, onError?: (error: any) => any) {
|
public deleteFolder(path: string, isKnown?: boolean, onSuccess?: () => any, onError?: (error: any) => any) {
|
||||||
|
if (isKnown) {
|
||||||
|
if (onError) {
|
||||||
|
onError({ message: "Cannot delete known folder." });
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.deleteEntity(path, onSuccess, onError);
|
this.deleteEntity(path, onSuccess, onError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user