diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java index 1e8a1c9a..7e927258 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java @@ -224,9 +224,22 @@ public class ScriptOperations { .putExtra(ShortcutCreateActivity.EXTRA_FILE, file)); } - @SuppressLint("CheckResult") public void delete(final ScriptFile scriptFile) { - Observable.fromPublisher((Publisher) s -> s.onNext(PFiles.deleteRecursively(scriptFile))).subscribeOn(Schedulers.io()) + new ThemeColorMaterialDialogBuilder(mContext) + .title(mContext.getString(R.string.text_are_you_sure_to_delete, scriptFile.getName())) + .positiveText(R.string.cancel) + .negativeText(R.string.ok) + .onNegative((dialog, which) -> { + deleteWithoutConfirm(scriptFile); + }) + .show(); + + } + + @SuppressLint("CheckResult") + public void deleteWithoutConfirm(final ScriptFile scriptFile) { + Observable.fromPublisher((Publisher) s -> s.onNext(PFiles.deleteRecursively(scriptFile))) + .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(deleted -> { showMessage(deleted ? R.string.text_already_delete : R.string.text_delete_failed); @@ -235,6 +248,7 @@ public class ScriptOperations { }); } + public Observable download(String url) { String fileName = DownloadManager.parseFileNameLocally(url); return new FileChooserDialogBuilder(mContext) diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/ScriptListView.java b/app/src/main/java/org/autojs/autojs/ui/main/scripts/ScriptListView.java index ca0850cc..20f044e6 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/ScriptListView.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/ScriptListView.java @@ -1,5 +1,6 @@ package org.autojs.autojs.ui.main.scripts; +import android.annotation.SuppressLint; import android.content.Context; import android.graphics.drawable.GradientDrawable; import android.support.annotation.Nullable; @@ -278,6 +279,7 @@ public class ScriptListView extends ThemeColorSwipeRefreshLayout implements Swip } } + @SuppressLint("CheckResult") private void sort(final int sortType, final boolean isDir) { setRefreshing(true); Observable.fromCallable(() -> { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 42346bcc..b00558ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -381,4 +381,5 @@ 执行 使用系统闹钟唤醒Auto.js 连接失败: %s + 确定要删除%s吗