Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core.manager): 修复deleteInstalledPlugin方法调用结果总是返回false #1259

Merged
merged 1 commit into from
Nov 28, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -355,22 +355,41 @@ public boolean deleteInstalledPlugin(String uuid) {

private boolean deletePart(InstalledPlugin.Part part) {
boolean suc = true;
if (!part.pluginFile.delete()) {
if (!deleteFileOrDirectory(part.pluginFile)) {
suc = false;
}
if (part.oDexDir != null) {
if (!part.oDexDir.delete()) {
suc = false;
}
if (part.oDexDir != null && !deleteFileOrDirectory(part.oDexDir)) {
suc = false;
}
if (part.libraryDir != null) {
if (!part.libraryDir.delete()) {
suc = false;
}
if (part.libraryDir != null && !deleteFileOrDirectory(part.libraryDir)) {
suc = false;
}
return suc;
}

/**
* 删除文件或目录,递归删除
*
* @param fileOrDirectory 文件或目录
* @return 是否删除成功
*/
private boolean deleteFileOrDirectory(File fileOrDirectory) {
if (fileOrDirectory == null || !fileOrDirectory.exists()) {
return true;
}
if (fileOrDirectory.isDirectory()) {
File[] files = fileOrDirectory.listFiles();
if (files != null) {
for (File file : files) {
if (!deleteFileOrDirectory(file)) {
return false;
}
}
}
}
return fileOrDirectory.delete();
}

/**
* 当前插件希望采用的ABI。
* 子类可以override重新决定。
Expand Down
Loading