diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json
index 4af83e9a..16528145 100644
--- a/.changelog/lang_zh-Hans.json
+++ b/.changelog/lang_zh-Hans.json
@@ -1,10 +1,11 @@
{
"$data": {
"v6.7.0": {
- "released_date": "2026/02/03",
+ "released_date": "2026/02/04",
"feature": [
"插件中心功能, 支持插件的安装/卸载/更新等操作 (入口: 主页抽屉按钮/主页标签页)",
- "版本历史功能, 支持查看/恢复可编辑文件的历史版本 (入口: 代码编辑器菜单)",
+ "版本历史功能, 支持查看/恢复可编辑文件的历史版本 (入口: 主页抽屉按钮/文件管理器菜单/代码编辑器菜单)",
+ "回收站功能, 支持查看/恢复已删除的文件/文件夹 (入口: 主页抽屉按钮)",
"Paddle OCR (PP-OCRv5) 插件, 用于光学字符识别",
"cvt 模块, 用于数据单位转换 (参阅 项目文档 > [单位转换](https://docs.autojs6.com/#/cvt))",
"fmt 模块, 用于数据格式化 (参阅 项目文档 > [格式化](https://docs.autojs6.com/#/fmt))",
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8640dab0..48286556 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -349,6 +349,14 @@
+
+
+
+
+ val rel = f.relativeTo(applicationContext.filesDir).invariantSeparatorsPath
+ if (!referenced.contains(rel)) {
+ // noinspection ResultOfMethodCallIgnored
+ f.delete()
+ }
+ }
+
+ // Best-effort: remove empty directories.
+ // zh-CN: 尽力删除空目录.
+ root.walkBottomUp()
+ .filter { it.isDirectory }
+ .forEach { dir ->
+ val children = dir.listFiles()
+ if (children == null || children.isEmpty()) {
+ // noinspection ResultOfMethodCallIgnored
+ dir.delete()
+ }
+ }
+ }
+
private fun cleanupEmergencyDrafts() {
// Keep consistent with EditorView's local cleanup policy.
// zh-CN: 与 EditorView 的本地清理策略保持一致.
@@ -118,6 +172,7 @@ class HistoryCleanupWorker(
companion object {
private const val MAX_DAYS_MS: Long = 30L * 24L * 60L * 60L * 1000L
+ private const val TRASH_MAX_DAYS_MS: Long = 30L * 24L * 60L * 60L * 1000L
private const val DRAFT_MAX_DAYS_MS: Long = 7L * 24L * 60L * 60L * 1000L
private const val DRAFT_MAX_TOTAL_BYTES: Long = 200L * 1024L * 1024L
}
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/HistoryDao.kt b/app/src/main/java/org/autojs/autojs/storage/history/HistoryDao.kt
index 9590d860..dedeb8db 100644
--- a/app/src/main/java/org/autojs/autojs/storage/history/HistoryDao.kt
+++ b/app/src/main/java/org/autojs/autojs/storage/history/HistoryDao.kt
@@ -40,4 +40,19 @@ interface HistoryDao {
@Query("SELECT blobRelPath FROM revision")
fun listAllBlobRelPaths(): List
+
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ fun upsertTrashItem(item: TrashEntities.TrashItem)
+
+ @Query("SELECT * FROM trash_item ORDER BY trashedAt DESC")
+ fun listTrashItemsDesc(): List
+
+ @Query("SELECT * FROM trash_item WHERE trashedAt < :expiredBefore ORDER BY trashedAt ASC")
+ fun listExpiredTrashItems(expiredBefore: Long): List
+
+ @Query("DELETE FROM trash_item WHERE trashId IN (:trashIds)")
+ fun deleteTrashItemsByIds(trashIds: List)
+
+ @Query("SELECT blobRelPath FROM trash_item")
+ fun listAllTrashBlobRelPaths(): List
}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/HistoryDatabase.kt b/app/src/main/java/org/autojs/autojs/storage/history/HistoryDatabase.kt
index e6067e85..c78885c6 100644
--- a/app/src/main/java/org/autojs/autojs/storage/history/HistoryDatabase.kt
+++ b/app/src/main/java/org/autojs/autojs/storage/history/HistoryDatabase.kt
@@ -4,6 +4,8 @@ import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
/**
* Created by JetBrains AI Assistant (GPT-5.2) on Feb 3, 2026.
@@ -12,8 +14,9 @@ import androidx.room.RoomDatabase
entities = [
HistoryEntities.FileEntry::class,
HistoryEntities.Revision::class,
+ TrashEntities.TrashItem::class,
],
- version = 1,
+ version = 2,
exportSchema = false,
)
abstract class HistoryDatabase : RoomDatabase() {
@@ -25,12 +28,37 @@ abstract class HistoryDatabase : RoomDatabase() {
@Volatile
private var instance: HistoryDatabase? = null
+ // Migration from v1 to v2 (add trash_item).
+ // zh-CN: 从 v1 到 v2 的迁移 (新增 trash_item 表).
+ private val MIGRATION_1_2 = object : Migration(1, 2) {
+ override fun migrate(db: SupportSQLiteDatabase) {
+ db.execSQL(
+ """
+ CREATE TABLE IF NOT EXISTS trash_item (
+ trashId TEXT NOT NULL PRIMARY KEY,
+ originalPath TEXT NOT NULL,
+ fileId TEXT,
+ trashedAt INTEGER NOT NULL,
+ isDirectory INTEGER NOT NULL,
+ sizeBytes INTEGER NOT NULL,
+ sha256 TEXT,
+ blobRelPath TEXT NOT NULL
+ )
+ """.trimIndent()
+ )
+ db.execSQL("CREATE INDEX IF NOT EXISTS index_trash_item_originalPath ON trash_item(originalPath)")
+ db.execSQL("CREATE INDEX IF NOT EXISTS index_trash_item_trashedAt ON trash_item(trashedAt)")
+ }
+ }
+
fun getInstance(applicationContext: Context): HistoryDatabase = instance ?: synchronized(this) {
instance ?: Room.databaseBuilder(
applicationContext,
HistoryDatabase::class.java,
"history-database.db",
- ).build().also { instance = it }
+ ).apply {
+ addMigrations(MIGRATION_1_2)
+ }.build().also { instance = it }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/TrashBlobStoreUtils.kt b/app/src/main/java/org/autojs/autojs/storage/history/TrashBlobStoreUtils.kt
new file mode 100644
index 00000000..65eeda0e
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/storage/history/TrashBlobStoreUtils.kt
@@ -0,0 +1,55 @@
+package org.autojs.autojs.storage.history
+
+import android.content.Context
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.FileInputStream
+import java.util.UUID
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+
+/**
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+class TrashBlobStore(private val context: Context) {
+
+ fun newTrashId(): String = UUID.randomUUID().toString()
+
+ fun writeTrashBlob(trashId: String, bytes: ByteArray): String {
+ val rel = "trash/blob/$trashId.bin"
+ val f = File(context.filesDir, rel)
+ f.parentFile?.mkdirs()
+ f.outputStream().use { it.write(bytes) }
+ return rel
+ }
+
+ fun deleteBlobByRelPath(relPath: String) {
+ val f = File(context.filesDir, relPath)
+ if (f.exists()) {
+ // noinspection ResultOfMethodCallIgnored
+ f.delete()
+ }
+ }
+
+ /**
+ * Pack a directory into zip bytes.
+ * zh-CN: 将目录打包为 zip bytes.
+ */
+ fun zipDirectoryToBytes(dir: File): ByteArray {
+ require(dir.isDirectory) { "Not a directory: $dir" }
+
+ val baos = ByteArrayOutputStream()
+ ZipOutputStream(baos).use { zos ->
+ val basePathLen = dir.absolutePath.trimEnd('/').length + 1
+ dir.walkTopDown().forEach { f ->
+ if (!f.isFile) return@forEach
+ val relPath = f.absolutePath.substring(basePathLen).replace(File.separatorChar, '/')
+ val entry = ZipEntry(relPath)
+ zos.putNextEntry(entry)
+ FileInputStream(f).use { it.copyTo(zos) }
+ zos.closeEntry()
+ }
+ }
+ return baos.toByteArray()
+ }
+}
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/TrashItemEntity.kt b/app/src/main/java/org/autojs/autojs/storage/history/TrashItemEntity.kt
new file mode 100644
index 00000000..c9469bb4
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/storage/history/TrashItemEntity.kt
@@ -0,0 +1,45 @@
+package org.autojs.autojs.storage.history
+
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+/**
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+object TrashEntities {
+
+ @Entity(
+ tableName = "trash_item",
+ indices = [
+ Index(value = ["originalPath"]),
+ Index(value = ["trashedAt"]),
+ ],
+ )
+ data class TrashItem(
+ @PrimaryKey
+ val trashId: String,
+
+ // Original logical path under /storage/emulated/0.
+ // zh-CN: 原始 logical path, 位于 /storage/emulated/0 下.
+ val originalPath: String,
+
+ // Optional: link to history fileId if we can resolve it later.
+ // zh-CN: 可选: 未来可关联到 history 的 fileId.
+ val fileId: String?,
+
+ val trashedAt: Long,
+
+ // Whether the blob represents a directory archive.
+ // zh-CN: blob 是否为目录打包归档.
+ val isDirectory: Boolean,
+
+ val sizeBytes: Long,
+
+ val sha256: String?,
+
+ // Blob relative path under filesDir.
+ // zh-CN: 位于 filesDir 下的相对路径.
+ val blobRelPath: String,
+ )
+}
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/TrashRepository.kt b/app/src/main/java/org/autojs/autojs/storage/history/TrashRepository.kt
new file mode 100644
index 00000000..c2fddf3a
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/storage/history/TrashRepository.kt
@@ -0,0 +1,135 @@
+package org.autojs.autojs.storage.history
+
+import android.content.Context
+import java.io.File
+import java.io.FileInputStream
+import java.security.MessageDigest
+import java.util.Locale
+import java.util.zip.ZipInputStream
+
+/**
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+class TrashRepository(private val context: Context) {
+
+ private val db by lazy { HistoryDatabase.getInstance(context.applicationContext) }
+ private val dao by lazy { db.historyDao() }
+ private val blobs by lazy { TrashBlobStore(context.applicationContext) }
+
+ /**
+ * Move a file or directory into trash.
+ *
+ * Notes:
+ * - Only internal storage paths are supported.
+ * - Directory is archived as zip bytes.
+ *
+ * zh-CN:
+ *
+ * 将文件或目录移入回收站.
+ *
+ * 注意:
+ * - 仅支持内部存储路径.
+ * - 目录会被打包为 zip bytes.
+ */
+ fun moveToTrash(path: String): TrashEntities.TrashItem {
+ val src = File(path)
+ require(src.exists()) { "Source not exists: $path" }
+
+ val logicalPath = path.trimEnd('/')
+
+ val trashId = blobs.newTrashId()
+ val now = System.currentTimeMillis()
+
+ val (bytes, isDir) = if (src.isDirectory) {
+ blobs.zipDirectoryToBytes(src) to true
+ } else {
+ src.inputStream().use { it.readBytes() } to false
+ }
+
+ val sha = sha256Hex(bytes)
+ val rel = blobs.writeTrashBlob(trashId, bytes)
+
+ // Delete original after blob persisted.
+ // zh-CN: 在 blob 落盘后删除源文件/目录.
+ val deleted = if (src.isDirectory) {
+ src.deleteRecursively()
+ } else {
+ src.delete()
+ }
+ if (!deleted && src.exists()) {
+ throw IllegalStateException("Failed to delete source after trash: $src")
+ }
+
+ val item = TrashEntities.TrashItem(
+ trashId = trashId,
+ originalPath = logicalPath,
+ fileId = null,
+ trashedAt = now,
+ isDirectory = isDir,
+ sizeBytes = bytes.size.toLong(),
+ sha256 = sha,
+ blobRelPath = rel,
+ )
+ dao.upsertTrashItem(item)
+ return item
+ }
+
+ /**
+ * Restore a trash item to a target path.
+ *
+ * Notes:
+ * - For directories, dest must be a directory path.
+ * - Restore will remove the trash item if succeeded.
+ *
+ * zh-CN:
+ *
+ * 将回收站条目恢复到目标路径.
+ *
+ * 说明:
+ * - 若为目录, dest 必须是目录路径.
+ * - 恢复成功后会删除回收站条目.
+ */
+ fun restoreTrashItemToPath(item: TrashEntities.TrashItem, dest: File) {
+ val blobFile = File(context.filesDir, item.blobRelPath)
+ require(blobFile.exists()) { "Trash blob not exists: ${item.blobRelPath}" }
+
+ if (item.isDirectory) {
+ dest.mkdirs()
+ ZipInputStream(FileInputStream(blobFile)).use { zis ->
+ while (true) {
+ val entry = zis.nextEntry ?: break
+ val outFile = File(dest, entry.name)
+
+ if (entry.isDirectory) {
+ outFile.mkdirs()
+ zis.closeEntry()
+ continue
+ }
+
+ outFile.parentFile?.mkdirs()
+ outFile.outputStream().use { os -> zis.copyTo(os) }
+ zis.closeEntry()
+ }
+ }
+ } else {
+ dest.parentFile?.mkdirs()
+ blobFile.inputStream().use { input ->
+ dest.outputStream().use { output -> input.copyTo(output) }
+ }
+ }
+
+ // Remove trash record and blob after successful restore.
+ // zh-CN: 恢复成功后删除回收站记录与 blob.
+ dao.deleteTrashItemsByIds(listOf(item.trashId))
+ blobs.deleteBlobByRelPath(item.blobRelPath)
+ }
+
+ private fun sha256Hex(bytes: ByteArray): String {
+ val digest = MessageDigest.getInstance("SHA-256").digest(bytes)
+ val sb = StringBuilder(digest.size * 2)
+ for (b in digest) {
+ sb.append(String.format(Locale.US, "%02x", b))
+ }
+ return sb.toString()
+ }
+}
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/TrashRestoreController.kt b/app/src/main/java/org/autojs/autojs/storage/history/TrashRestoreController.kt
new file mode 100644
index 00000000..b10ff518
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/storage/history/TrashRestoreController.kt
@@ -0,0 +1,189 @@
+package org.autojs.autojs.storage.history
+
+import android.annotation.SuppressLint
+import android.content.Context
+import com.afollestad.materialdialogs.DialogAction
+import com.afollestad.materialdialogs.MaterialDialog
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import org.autojs.autojs.app.DialogUtils
+import org.autojs.autojs.app.DialogUtils.setActionButtonText
+import org.autojs.autojs.ui.filechooser.FileChooserDialogBuilder
+import org.autojs.autojs.util.MaterialDialogUtils.choiceWidgetThemeColor
+import org.autojs.autojs.util.ViewUtils
+import org.autojs.autojs6.R
+import java.io.File
+import java.util.regex.Pattern
+
+/**
+ * Restore flow controller for trash items.
+ * zh-CN: 回收站条目的恢复流程控制器.
+ *
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+class TrashRestoreController(private val context: Context) {
+
+ fun startRestoreFlow(item: TrashEntities.TrashItem) {
+ val originalPath = item.originalPath
+ val originalName = File(originalPath).name
+
+ val selected = intArrayOf(0)
+
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(context)
+ .title(R.string.text_choose_restore_path)
+ .content(context.getString(R.string.text_path_colon_value, originalPath))
+ .items(
+ context.getString(R.string.text_restore_to_original_path),
+ context.getString(R.string.text_restore_to_specified_path),
+ )
+ .itemsCallbackSingleChoice(0) { dialog, _, which, _ ->
+ selected[0] = which
+
+ // Update content and positive button text dynamically.
+ // zh-CN: 动态更新内容与确认按钮文本.
+ when (which) {
+ 0 -> {
+ dialog.setContent(context.getString(R.string.text_path_colon_value, originalPath))
+ dialog.setActionButtonText(DialogAction.POSITIVE, context.getString(R.string.dialog_button_confirm))
+ }
+ else -> {
+ dialog.setContent(context.getString(R.string.text_file_name_colon_value, originalName))
+ dialog.setActionButtonText(DialogAction.POSITIVE, context.getString(R.string.dialog_button_choose_path))
+ }
+ }
+ true
+ }
+ .choiceWidgetThemeColor()
+ .negativeText(R.string.dialog_button_cancel)
+ .negativeColorRes(R.color.dialog_button_default)
+ .positiveText(R.string.dialog_button_confirm)
+ .positiveColorRes(R.color.dialog_button_attraction)
+ .onPositive { _, _ ->
+ when (selected[0]) {
+ 0 -> restoreToOriginalPathWithConflictHandling(item)
+ else -> chooseDirectoryThenRestore(item, originalName)
+ }
+ }
+ .cancelable(true)
+ .build()
+ }
+ }
+
+ private fun restoreToOriginalPathWithConflictHandling(item: TrashEntities.TrashItem) {
+ val dest = File(item.originalPath)
+ val parent = dest.parentFile ?: run {
+ ViewUtils.showToast(context, context.getString(R.string.error_invalid_path, item.originalPath), true)
+ return
+ }
+ restoreWithConflictHandling(item, parent, dest.name)
+ }
+
+ @SuppressLint("CheckResult")
+ private fun chooseDirectoryThenRestore(item: TrashEntities.TrashItem, fileName: String) {
+ FileChooserDialogBuilder(context)
+ .title(R.string.dialog_button_choose_path)
+ .dir(INTERNAL_STORAGE_ROOT)
+ .chooseDir()
+ .singleChoice()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe({ dir ->
+ restoreWithConflictHandling(item, File(dir.path), fileName)
+ }, { e ->
+ e.printStackTrace()
+ ViewUtils.showToast(context, e.message, true)
+ })
+ }
+
+ private fun restoreWithConflictHandling(item: TrashEntities.TrashItem, destDir: File, fileName: String) {
+ val dest = File(destDir, fileName)
+
+ if (!dest.exists()) {
+ restoreNow(item, dest)
+ return
+ }
+
+ // Ask overwrite or auto-suffix when name conflict.
+ // zh-CN: 同名冲突时询问覆盖或自动后缀.
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(context)
+ .title(R.string.text_prompt)
+ .content(context.getString(R.string.text_path_colon_value, dest.absolutePath))
+ .negativeText(R.string.dialog_button_cancel)
+ .negativeColorRes(R.color.dialog_button_default)
+ .neutralText(R.string.text_auto_rename)
+ .neutralColorRes(R.color.dialog_button_hint)
+ .onNeutral { _, _ ->
+ val newName = generateNextIndexedName(destDir, fileName)
+ restoreNow(item, File(destDir, newName))
+ }
+ .positiveText(R.string.text_overwrite)
+ .positiveColorRes(R.color.dialog_button_caution)
+ .onPositive { _, _ ->
+ restoreNow(item, dest)
+ }
+ .cancelable(true)
+ .build()
+ }
+ }
+
+ private fun restoreNow(item: TrashEntities.TrashItem, dest: File) {
+ Schedulers.io().scheduleDirect {
+ runCatching {
+ TrashRepository(context.applicationContext).restoreTrashItemToPath(item, dest)
+ AndroidSchedulers.mainThread().scheduleDirect {
+ ViewUtils.showToast(context, context.getString(R.string.text_done), true)
+ }
+ }.onFailure {
+ it.printStackTrace()
+ AndroidSchedulers.mainThread().scheduleDirect {
+ ViewUtils.showToast(context, it.message, true)
+ }
+ }
+ }
+ }
+
+ /**
+ * Generate next indexed name by scanning existing "-n" siblings and taking the first missing n from 1.
+ * zh-CN: 通过扫描同级目录中已有的 "-n" 名称, 从 1 开始取第一个缺失的 n 作为新后缀.
+ */
+ private fun generateNextIndexedName(parentDir: File, originalName: String): String {
+ val isDirectory = !originalName.contains('.')
+ val base: String
+ val extWithDot: String
+
+ if (isDirectory) {
+ base = originalName
+ extWithDot = ""
+ } else {
+ val dot = originalName.lastIndexOf('.')
+ base = if (dot > 0) originalName.substring(0, dot) else originalName
+ extWithDot = if (dot > 0) originalName.substring(dot) else ""
+ }
+
+ val files = parentDir.listFiles()?.map { it.name } ?: emptyList()
+
+ val existingIndexes = HashSet()
+ val pattern = if (isDirectory) {
+ Regex("^" + Pattern.quote(base) + "-(\\d+)$")
+ } else {
+ Regex("^" + Pattern.quote(base) + "-(\\d+)" + Pattern.quote(extWithDot) + "$")
+ }
+
+ for (name in files) {
+ val m = pattern.matchEntire(name) ?: continue
+ val idx = m.groups[1]?.value?.toIntOrNull() ?: continue
+ existingIndexes.add(idx)
+ }
+
+ var n = 1
+ while (existingIndexes.contains(n)) n++
+
+ return if (isDirectory) "$base-$n" else "$base-$n$extWithDot"
+ }
+
+ companion object {
+ private const val INTERNAL_STORAGE_ROOT: String = "/storage/emulated/0"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/storage/history/VersionHistoryController.kt b/app/src/main/java/org/autojs/autojs/storage/history/VersionHistoryController.kt
new file mode 100644
index 00000000..61e69443
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/storage/history/VersionHistoryController.kt
@@ -0,0 +1,295 @@
+package org.autojs.autojs.storage.history
+
+import android.content.Context
+import android.net.Uri
+import com.afollestad.materialdialogs.MaterialDialog
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import org.autojs.autojs.app.DialogUtils
+import org.autojs.autojs.pio.PFiles
+import org.autojs.autojs.ui.common.NotAskAgainDialog
+import org.autojs.autojs.util.MaterialDialogUtils.choiceWidgetThemeColor
+import org.autojs.autojs.util.MaterialDialogUtils.widgetThemeColor
+import org.autojs.autojs.util.StringUtils
+import org.autojs.autojs.util.StringUtils.key
+import org.autojs.autojs.util.ViewUtils
+import org.autojs.autojs6.R
+import java.io.File
+import java.io.IOException
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Version history dialog controller.
+ * zh-CN: 版本历史对话框控制器.
+ *
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+class VersionHistoryController(private val context: Context) {
+
+ /**
+ * Show version history for editor (restore into editor only, not auto-save).
+ * zh-CN: 为编辑器显示版本历史 (仅恢复到编辑器, 不自动保存).
+ */
+ fun showForEditor(
+ uri: Uri,
+ onRestoreToEditor: (restoredText: String) -> Unit,
+ onRestoredUi: () -> Unit,
+ ) {
+ val logicalPath = HistoryUriUtils.toLogicalPathOrNull(uri)
+ if (logicalPath == null) {
+ showNoHistoryDialog()
+ return
+ }
+ loadAndShow(
+ logicalPath = logicalPath,
+ mode = Mode.RESTORE_TO_EDITOR,
+ onRestoreToEditor = onRestoreToEditor,
+ onRestoredUi = onRestoredUi,
+ )
+ }
+
+ /**
+ * Show version history for explorer (restore to disk, overwriting the file content).
+ * zh-CN: 为资源管理器显示版本历史 (恢复并写回磁盘, 覆盖文件内容).
+ */
+ fun showForFilePath(path: String) {
+ val normalized = path.trimEnd('/')
+ if (!normalized.startsWith(INTERNAL_STORAGE_ROOT)) {
+ showNoHistoryDialog()
+ return
+ }
+ loadAndShow(
+ logicalPath = normalized,
+ mode = Mode.RESTORE_TO_DISK,
+ onRestoreToEditor = null,
+ onRestoredUi = null,
+ )
+ }
+
+ private fun showNoHistoryDialog() {
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(context)
+ .title(R.string.text_version_history)
+ .content(R.string.text_no_version_history)
+ .positiveText(R.string.dialog_button_dismiss)
+ .positiveColorRes(R.color.dialog_button_default)
+ .cancelable(true)
+ .build()
+ }
+ }
+
+ private fun loadAndShow(
+ logicalPath: String,
+ mode: Mode,
+ onRestoreToEditor: ((String) -> Unit)?,
+ onRestoredUi: (() -> Unit)?,
+ ) {
+ Schedulers.io().scheduleDirect {
+ runCatching {
+ val appCtx = context.applicationContext
+ val dao = HistoryDatabase.getInstance(appCtx).historyDao()
+
+ val fileEntry = dao.findFileByPath(logicalPath)
+ val fileId = fileEntry?.fileId
+
+ val revs = if (fileId != null) {
+ // Show latest first for selection.
+ // zh-CN: 列表按最新优先展示供选择.
+ dao.listRevisionsAsc(fileId).asReversed().take(HISTORY_DIALOG_MAX_ITEMS)
+ } else {
+ emptyList()
+ }
+
+ AndroidSchedulers.mainThread().scheduleDirect {
+ if (revs.isEmpty()) {
+ showNoHistoryDialog()
+ return@scheduleDirect
+ }
+
+ val fmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+ val items = revs.map { rev ->
+ val t = fmt.format(Date(rev.createdAt))
+ val size = rev.sizeBytes
+ "$t | ${PFiles.formatSizeWithUnit(size)}"
+ }
+
+ val selectedIndex = intArrayOf(0)
+
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(context)
+ .title(R.string.text_version_history)
+ .items(items)
+ .itemsCallbackSingleChoice(0) { _, _, which, _ ->
+ selectedIndex[0] = which
+ true
+ }
+ .choiceWidgetThemeColor()
+ .negativeText(R.string.dialog_button_cancel)
+ .negativeColorRes(R.color.dialog_button_default)
+ .positiveText(R.string.dialog_button_retrieve)
+ .positiveColorRes(R.color.dialog_button_attraction)
+ .onPositive { _, _ ->
+ val chosen = revs.getOrNull(selectedIndex[0]) ?: return@onPositive
+ when (mode) {
+ Mode.RESTORE_TO_EDITOR -> {
+ showRestoreConfirmDialogForEditor {
+ restoreToEditor(chosen, onRestoreToEditor, onRestoredUi)
+ }
+ }
+ Mode.RESTORE_TO_DISK -> {
+ showRestoreConfirmDialogForDisk(logicalPath) {
+ restoreToDisk(chosen, logicalPath)
+ }
+ }
+ }
+ }
+ .cancelable(true)
+ .build()
+ }
+ }
+ }.onFailure {
+ it.printStackTrace()
+ AndroidSchedulers.mainThread().scheduleDirect {
+ ViewUtils.showToast(context, it.message, true)
+ }
+ }
+ }
+ }
+
+ private fun restoreToEditor(
+ rev: HistoryEntities.Revision,
+ onRestoreToEditor: ((String) -> Unit)?,
+ onRestoredUi: (() -> Unit)?,
+ ) {
+ val appCtx = context.applicationContext
+ Schedulers.io().scheduleDirect {
+ runCatching {
+ val bytes = HistoryRepository(appCtx).readRevisionBytes(rev)
+ val restored = decodeRevisionBytes(bytes, rev.encoding, rev.hadBom)
+ AndroidSchedulers.mainThread().scheduleDirect {
+ onRestoreToEditor?.invoke(restored)
+ onRestoredUi?.invoke()
+ }
+ }.onFailure {
+ it.printStackTrace()
+ AndroidSchedulers.mainThread().scheduleDirect {
+ ViewUtils.showToast(context, it.message, true)
+ }
+ }
+ }
+ }
+
+ private fun restoreToDisk(rev: HistoryEntities.Revision, targetPath: String) {
+ val appCtx = context.applicationContext
+ Schedulers.io().scheduleDirect {
+ runCatching {
+ val bytes = HistoryRepository(appCtx).readRevisionBytes(rev)
+ writeBytesTransactional(File(targetPath), bytes)
+ AndroidSchedulers.mainThread().scheduleDirect {
+ ViewUtils.showToast(context, context.getString(R.string.text_done), true)
+ }
+ }.onFailure {
+ it.printStackTrace()
+ AndroidSchedulers.mainThread().scheduleDirect {
+ ViewUtils.showToast(context, it.message, true)
+ }
+ }
+ }
+ }
+
+ private fun writeBytesTransactional(dest: File, bytes: ByteArray) {
+ dest.parentFile?.mkdirs()
+
+ val tmp = File(dest.parentFile, dest.name + ".restore.tmp")
+ tmp.outputStream().use { it.write(bytes) }
+
+ val newHash = sha256(bytes)
+ val readBackHash = sha256(tmp.inputStream().use { it.readBytes() })
+ if (!readBackHash.contentEquals(newHash)) {
+ // Delete temp file when verification failed.
+ // zh-CN: 校验失败时删除临时文件.
+ // noinspection ResultOfMethodCallIgnored
+ tmp.delete()
+ throw IOException("Write verification failed (hash mismatch): ${dest.absolutePath}")
+ }
+
+ if (dest.exists() && !dest.delete()) {
+ // noinspection ResultOfMethodCallIgnored
+ tmp.delete()
+ throw IOException("Failed to replace destination: ${dest.absolutePath}")
+ }
+ if (!tmp.renameTo(dest)) {
+ // noinspection ResultOfMethodCallIgnored
+ tmp.delete()
+ throw IOException("Failed to commit restored file: ${dest.absolutePath}")
+ }
+ }
+
+ private fun showRestoreConfirmDialogForEditor(onConfirm: () -> Unit) {
+ // Use "Not ask again" for editor restoring.
+ // zh-CN: 编辑器恢复使用 "不再提示" 的确认方式.
+ DialogUtils.buildAndShowAdaptiveOrNull {
+ NotAskAgainDialog.Builder(
+ context,
+ key(R.string.key_version_history_restore_does_not_auto_save_to_disk),
+ ).apply {
+ title(R.string.text_prompt)
+ content(R.string.text_version_history_restore_does_not_auto_save_to_disk)
+ widgetThemeColor()
+ negativeText(R.string.dialog_button_cancel)
+ negativeColorRes(R.color.dialog_button_default)
+ positiveText(R.string.dialog_button_confirm)
+ positiveColorRes(R.color.dialog_button_attraction)
+ onPositive { _, _ -> onConfirm() }
+ cancelable(false)
+ }.build()
+ } ?: onConfirm()
+ }
+
+ private fun showRestoreConfirmDialogForDisk(targetPath: String, onConfirm: () -> Unit) {
+ // Restore to disk will overwrite file content.
+ // zh-CN: 写回磁盘的恢复会覆盖文件内容.
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(context)
+ .title(R.string.text_prompt)
+ .content(context.getString(R.string.text_version_history_restore_will_overwrite_file, targetPath))
+ .negativeText(R.string.dialog_button_cancel)
+ .negativeColorRes(R.color.dialog_button_default)
+ .positiveText(R.string.dialog_button_confirm)
+ .positiveColorRes(R.color.dialog_button_caution)
+ .onPositive { _, _ -> onConfirm() }
+ .cancelable(true)
+ .build()
+ }
+ }
+
+ private fun decodeRevisionBytes(bytes: ByteArray, encodingName: String, hadBom: Boolean): String {
+ val charset = runCatching { Charset.forName(encodingName) }.getOrElse { DEFAULT_CHARSET }
+ val effective = if (hadBom) {
+ // Drop BOM before decoding because BOM presence is tracked by metadata.
+ // zh-CN: BOM 是否存在由元数据记录, 解码前需丢弃 BOM.
+ StringUtils.dropBom(bytes, charset)
+ } else bytes
+ return String(effective, charset)
+ }
+
+ private fun sha256(bytes: ByteArray): ByteArray {
+ return MessageDigest.getInstance("SHA-256").digest(bytes)
+ }
+
+ private enum class Mode {
+ RESTORE_TO_EDITOR,
+ RESTORE_TO_DISK,
+ }
+
+ companion object {
+ private val DEFAULT_CHARSET: Charset = StandardCharsets.UTF_8
+ private const val HISTORY_DIALOG_MAX_ITEMS: Int = 20
+ private const val INTERNAL_STORAGE_ROOT: String = "/storage/emulated/0"
+ }
+}
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 3d8c0fb9..a5408d97 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
@@ -40,10 +40,12 @@ import org.autojs.autojs.pio.PFiles;
import org.autojs.autojs.pio.UncheckedIOException;
import org.autojs.autojs.project.ProjectConfig;
import org.autojs.autojs.storage.file.TmpScriptFiles;
+import org.autojs.autojs.storage.history.TrashRepository;
import org.autojs.autojs.ui.filechooser.FileChooserDialogBuilder;
import org.autojs.autojs.ui.shortcut.ShortcutCreateActivity;
import org.autojs.autojs.ui.timing.TimedTaskSettingActivity;
import org.autojs.autojs.util.EnvironmentUtils;
+import org.autojs.autojs.util.FileUtils;
import org.autojs.autojs.util.IntentUtils;
import org.autojs.autojs.util.MaterialDialogUtils;
import org.autojs.autojs.util.ShortcutUtils;
@@ -67,7 +69,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.autojs.autojs.util.FileUtils;
import static org.autojs.autojs.app.DialogUtils.fixCheckBoxGravity;
import static org.autojs.autojs.model.explorer.ExplorerFileItem.isInSampleDir;
@@ -957,14 +958,31 @@ public class ScriptOperations {
}
public void delete(final ScriptFile scriptFile) {
- DialogUtils.showAdaptive(new MaterialDialog.Builder(mContext)
- .title(mContext.getString(R.string.text_confirm_to_delete))
- .content(scriptFile.getName())
- .negativeText(R.string.text_cancel)
- .positiveText(R.string.dialog_button_confirm)
- .positiveColorRes(R.color.dialog_button_caution)
- .onPositive((dialog, which) -> deleteWithoutConfirm(scriptFile))
- .build());
+ DialogUtils.buildAndShowAdaptive(() -> {
+ MaterialDialog.Builder builder = new MaterialDialog.Builder(mContext)
+ .title(R.string.text_choose_delete_strategy)
+ .content(scriptFile.getName())
+ .items(
+ mContext.getString(R.string.item_move_to_trash),
+ mContext.getString(R.string.item_delete_permanently)
+ )
+ .itemsCallbackSingleChoice(0, (dialog, itemView, which, text) -> {
+ dialog.dismiss();
+
+ if (which == 0) {
+ moveToTrashWithProgress(scriptFile);
+ } else if (which == 1) {
+ deleteWithoutConfirm(scriptFile);
+ }
+
+ return true;
+ })
+ .negativeText(R.string.dialog_button_cancel)
+ .positiveText(R.string.dialog_button_confirm)
+ .positiveColorRes(R.color.dialog_button_caution);
+ MaterialDialogUtils.choiceWidgetThemeColor(builder);
+ return builder.build();
+ });
}
public void setAsWorkingDir(final ScriptFile scriptFile) {
@@ -987,6 +1005,68 @@ public class ScriptOperations {
.build());
}
+ private void moveToTrashWithProgress(final ScriptFile scriptFile) {
+ boolean isDir = scriptFile.isDirectory();
+ int titleRes = isDir ? R.string.text_delete_folder : R.string.text_delete_file;
+
+ Observable.fromCallable(() -> {
+ OperationController controller = new OperationController();
+ ProgressDialogSession session = new ProgressDialogSession(controller);
+
+ try {
+ // Indeterminate progress is acceptable for trashing.
+ // zh-CN: 移入回收站使用不确定进度条即可.
+ MaterialDialog.Builder builder = new MaterialDialog.Builder(mContext)
+ .title(titleRes)
+ .content(R.string.ellipsis_six)
+ .negativeText(R.string.dialog_button_abort)
+ .negativeColorRes(R.color.dialog_button_caution)
+ .onNegative((dialog, which) -> {
+ controller.cancel();
+ try {
+ dialog.setContent(mContext.getString(R.string.text_aborting));
+ } catch (Throwable ignored) {
+ /* Ignored. */
+ }
+ })
+ .progress(true, 0)
+ .progressIndeterminateStyle(true)
+ .cancelable(false)
+ .canceledOnTouchOutside(false);
+
+ session.scheduleShow(builder);
+
+ controller.throwIfCancelled();
+
+ // Move into trash (blob + db) then notify explorer.
+ // zh-CN: 移入回收站 (blob + db), 然后通知资源管理器.
+ new TrashRepository(mContext.getApplicationContext())
+ .moveToTrash(scriptFile.getPath());
+
+ return 1;
+ } catch (OperationAbortedException aborted) {
+ return -1;
+ } finally {
+ session.dismissSafely();
+ }
+ })
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(result -> {
+ switch (result) {
+ case 1 -> {
+ showMessage(R.string.text_moved_to_trash);
+ notifyFileRemoved(ProjectConfig.isProject(scriptFile), scriptFile.isDirectory(), scriptFile);
+ }
+ case -1 -> showMessage(R.string.text_operation_aborted);
+ default -> showMessage(R.string.text_failed_to_delete);
+ }
+ }, e -> {
+ e.printStackTrace();
+ showMessage(R.string.text_failed_to_delete);
+ });
+ }
+
public void deleteWithoutConfirm(final ScriptFile scriptFile) {
boolean isDir = scriptFile.isDirectory();
boolean isProject = ProjectConfig.isProject(scriptFile);
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.kt b/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.kt
index 2212ecc3..5d441532 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.kt
@@ -44,15 +44,13 @@ import org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_LINE_NUMBER
import org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_MESSAGE
import org.autojs.autojs.model.script.Scripts.openByOtherApps
import org.autojs.autojs.model.script.Scripts.runWithBroadcastSender
-import org.autojs.autojs.pio.PFiles
import org.autojs.autojs.pio.PFiles.getNameWithoutExtension
import org.autojs.autojs.pio.PFiles.write
import org.autojs.autojs.storage.file.TmpScriptFiles
-import org.autojs.autojs.storage.history.HistoryDatabase
import org.autojs.autojs.storage.history.HistoryRepository
import org.autojs.autojs.storage.history.HistoryUriUtils
+import org.autojs.autojs.storage.history.VersionHistoryController
import org.autojs.autojs.tool.Callback
-import org.autojs.autojs.ui.common.NotAskAgainDialog
import org.autojs.autojs.ui.doc.ManualDialog
import org.autojs.autojs.ui.edit.completion.CodeCompletionBar
import org.autojs.autojs.ui.edit.completion.CodeCompletionBar.OnHintClickListener
@@ -76,10 +74,8 @@ import org.autojs.autojs.util.ClipboardUtils
import org.autojs.autojs.util.DisplayUtils.pxToSp
import org.autojs.autojs.util.DocsUtils.getUrl
import org.autojs.autojs.util.MaterialDialogUtils.choiceWidgetThemeColor
-import org.autojs.autojs.util.MaterialDialogUtils.widgetThemeColor
import org.autojs.autojs.util.Observers
import org.autojs.autojs.util.StringUtils
-import org.autojs.autojs.util.StringUtils.key
import org.autojs.autojs.util.ViewUtils.showSnack
import org.autojs.autojs.util.ViewUtils.showToast
import org.autojs.autojs6.R
@@ -89,8 +85,6 @@ import java.io.IOException
import java.nio.charset.Charset
import java.nio.charset.StandardCharsets
import java.security.MessageDigest
-import java.text.SimpleDateFormat
-import java.util.Date
import java.util.Locale
/**
@@ -717,140 +711,18 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
}
fun showVersionHistoryDialog() {
- val logicalPath = HistoryUriUtils.toLogicalPathOrNull(uri)
- if (logicalPath == null) {
- // History is only tracked under internal storage root.
- // zh-CN: 历史记录仅纳管内部存储根目录下的文件.
- DialogUtils.buildAndShowAdaptive {
- MaterialDialog.Builder(context)
- .title(R.string.text_version_history)
- .content(R.string.text_no_version_history)
- .positiveText(R.string.dialog_button_dismiss)
- .positiveColorRes(R.color.dialog_button_default)
- .cancelable(false)
- .build()
- }
- return
- }
-
- Schedulers.io().scheduleDirect {
- runCatching {
- val appCtx = context.applicationContext
- val db = HistoryDatabase.getInstance(appCtx)
- val dao = db.historyDao()
-
- val fileEntry = dao.findFileByPath(logicalPath)
- val fileId = fileEntry?.fileId
-
- val revs = if (fileId != null) {
- // Show latest first for selection.
- // zh-CN: 列表按最新优先展示供选择.
- dao.listRevisionsAsc(fileId).asReversed().take(HISTORY_DIALOG_MAX_ITEMS)
- } else {
- emptyList()
- }
-
- post {
- if (revs.isEmpty()) {
- DialogUtils.buildAndShowAdaptive {
- MaterialDialog.Builder(context)
- .title(R.string.text_version_history)
- .content(R.string.text_no_version_history)
- .positiveText(R.string.dialog_button_dismiss)
- .positiveColorRes(R.color.dialog_button_default)
- .cancelable(false)
- .build()
- }
- return@post
- }
-
- val fmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
- val items = revs.map { rev ->
- val t = fmt.format(Date(rev.createdAt))
- val size = rev.sizeBytes
- "$t | ${PFiles.formatSizeWithUnit(size)}"
- }
-
- val selectedIndex = intArrayOf(0)
-
- DialogUtils.buildAndShowAdaptive {
- MaterialDialog.Builder(context)
- .title(R.string.dialog_button_history)
- .items(items)
- .itemsCallbackSingleChoice(0) { _, _, which, _ ->
- selectedIndex[0] = which
- true
- }
- .negativeText(R.string.dialog_button_cancel)
- .negativeColorRes(R.color.dialog_button_default)
- .positiveText(R.string.dialog_button_retrieve)
- .positiveColorRes(R.color.dialog_button_attraction)
- .onPositive { _, _ ->
- val chosen = revs.getOrNull(selectedIndex[0]) ?: return@onPositive
-
- // Confirm before restoring to editor.
- // zh-CN: 恢复到编辑器前先做二次确认.
- showRestoreConfirmDialog() {
- // Load blob and restore into editor (not auto-save).
- // zh-CN: 读取 blob 并恢复到编辑器 (不自动保存).
- Schedulers.io().scheduleDirect {
- runCatching {
- val bytes = HistoryRepository(appCtx).readRevisionBytes(chosen)
- val restored = decodeRevisionBytes(
- bytes = bytes,
- encodingName = chosen.encoding,
- hadBom = chosen.hadBom,
- )
- post {
- editor.text = restored
- setMenuItemStatus(R.id.save, true)
- showSnack(this@EditorView, R.string.text_done)
- }
- }.onFailure {
- it.printStackTrace()
- post { showToast(context, it.message, true) }
- }
- }
- }
- }
- .cancelable(true)
- .build()
- }
- }
- }.onFailure {
- it.printStackTrace()
- post { showToast(context, it.message, true) }
- }
- }
- }
-
- private fun showRestoreConfirmDialog(onConfirm: () -> Unit) {
- DialogUtils.buildAndShowAdaptiveOrNull {
- NotAskAgainDialog.Builder(
- context,
- key(R.string.key_version_history_restore_does_not_auto_save_to_disk)
- ).apply {
- title(R.string.text_prompt)
- content(R.string.text_version_history_restore_does_not_auto_save_to_disk)
- widgetThemeColor()
- negativeText(R.string.dialog_button_cancel)
- negativeColorRes(R.color.dialog_button_default)
- positiveText(R.string.dialog_button_confirm)
- positiveColorRes(R.color.dialog_button_attraction)
- onPositive { _, _ -> onConfirm() }
- cancelable(false)
- }.build()
- } ?: onConfirm()
- }
-
- private fun decodeRevisionBytes(bytes: ByteArray, encodingName: String, hadBom: Boolean): String {
- val charset = runCatching { Charset.forName(encodingName) }.getOrElse { DEFAULT_CHARSET_TO_WRITE_FILE }
- val effective = if (hadBom) {
- // Drop BOM before decoding because BOM presence is tracked by metadata.
- // zh-CN: BOM 是否存在由元数据记录, 解码前需丢弃 BOM.
- StringUtils.dropBom(bytes, charset)
- } else bytes
- return String(effective, charset)
+ // Delegate to controller to unify editor/explorer/history page behavior.
+ // zh-CN: 委托给 Controller, 统一 editor/explorer/history page 的行为.
+ VersionHistoryController(context).showForEditor(
+ uri = uri,
+ onRestoreToEditor = { restoredText ->
+ editor.text = restoredText
+ },
+ onRestoredUi = {
+ setMenuItemStatus(R.id.save, true)
+ showSnack(this@EditorView, R.string.text_done)
+ },
+ )
}
// A minimal emergency draft store.
@@ -1211,10 +1083,6 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
// zh-CN: 草稿总容量上限 (200MB).
private const val DRAFT_MAX_TOTAL_BYTES: Long = 200L * 1024L * 1024L
- // Max items shown in history dialog.
- // zh-CN: 历史对话框最多展示条数.
- private const val HISTORY_DIALOG_MAX_ITEMS: Int = 20
-
// Internal storage root (no external SD).
// zh-CN: 内部存储根目录 (不访问外置 SD).
private const val INTERNAL_STORAGE_ROOT: String = "/storage/emulated/0"
diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.kt b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.kt
index f4246621..36ff75de 100644
--- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.kt
@@ -45,6 +45,7 @@ import org.autojs.autojs.model.script.Scripts
import org.autojs.autojs.pio.PFile
import org.autojs.autojs.pio.PFiles
import org.autojs.autojs.project.ProjectConfig
+import org.autojs.autojs.storage.history.VersionHistoryController
import org.autojs.autojs.theme.ThemeColorHelper
import org.autojs.autojs.theme.ThemeColorManagerCompat
import org.autojs.autojs.theme.widget.ThemeColorSwipeRefreshLayout
@@ -284,6 +285,16 @@ open class ExplorerView : ThemeColorSwipeRefreshLayout, SwipeRefreshLayout.OnRef
ScriptOperations(context, this@ExplorerView, currentPage)
.delete(selectedItem!!.toScriptFile())
}
+ R.id.action_version_history -> {
+ val selected = selectedItem ?: return false
+
+ // Show version history for this file and restore to disk when chosen.
+ // zh-CN: 显示该文件的版本历史, 选择后写回磁盘恢复.
+ VersionHistoryController(context).showForFilePath(selected.path)
+
+ notifyItemOperated()
+ mRequestHostDialogHide?.run()
+ }
R.id.action_run_repeatedly -> {
ScriptLoopDialog(context, selectedItem!!.toScriptFile())
.show()
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.kt b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.kt
index 4d405941..5f1fc23d 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.kt
@@ -48,6 +48,8 @@ import org.autojs.autojs.ui.fragment.BindingDelegates.viewBinding
import org.autojs.autojs.ui.main.MainActivity
import org.autojs.autojs.ui.settings.AboutActivity
import org.autojs.autojs.ui.settings.PreferencesActivity
+import org.autojs.autojs.ui.storage.TrashActivity
+import org.autojs.autojs.ui.storage.VersionHistoryActivity
import org.autojs.autojs.util.DisplayUtils
import org.autojs.autojs.util.IntentUtils.App.exit
import org.autojs.autojs.util.IntentUtils.App.restart
@@ -120,6 +122,8 @@ open class DrawerFragment : Fragment() {
private lateinit var mAutoNightModeItem: DrawerMenuToggleableItem
private lateinit var mKeepScreenOnWhenInForegroundItem: DrawerMenuToggleableItem
private lateinit var mThemeColorItem: DrawerMenuShortcutItem
+ private lateinit var mTrashItem: DrawerMenuShortcutItem
+ private lateinit var mVersionHistoryItem: DrawerMenuShortcutItem
private lateinit var mAboutAppAndDevItem: DrawerMenuShortcutItem
private lateinit var mA11yTool: AccessibilityTool
@@ -586,13 +590,35 @@ open class DrawerFragment : Fragment() {
descriptionRes = R.string.description_keep_screen_on_when_in_foreground,
)
- mThemeColorItem = DrawerMenuShortcutItem(R.drawable.ic_personalize_thicker, R.string.text_theme_color)
- .setAction(Runnable { ColorSelectBaseActivity.startActivity(mContext) })
- .apply { subtitle = ColorSelectBaseActivity.getCurrentColorSummary(mContext) }
+ mThemeColorItem = DrawerMenuShortcutItem(
+ icon = R.drawable.ic_personalize_thicker,
+ title = R.string.text_theme_color,
+ ).apply {
+ setAction { ColorSelectBaseActivity.startActivity(mContext) }
+ subtitle = ColorSelectBaseActivity.getCurrentColorSummary(mContext)
+ }
- mAboutAppAndDevItem = DrawerMenuShortcutItem(R.drawable.ic_about, R.string.text_about_app_and_developer)
- .setAction(Runnable { AboutActivity.startActivity(mContext) })
- .apply { subtitle = BuildConfig.VERSION_NAME }
+ mTrashItem = DrawerMenuShortcutItem(
+ icon = R.drawable.ic_recycle_bin,
+ title = R.string.text_trash,
+ ).apply {
+ setAction { TrashActivity.startActivity(mContext) }
+ }
+
+ mVersionHistoryItem = DrawerMenuShortcutItem(
+ icon = R.drawable.ic_version_history,
+ title = R.string.text_version_history,
+ ).apply {
+ setAction { VersionHistoryActivity.startActivity(mContext) }
+ }
+
+ mAboutAppAndDevItem = DrawerMenuShortcutItem(
+ icon = R.drawable.ic_about,
+ title = R.string.text_about_app_and_developer,
+ ).apply {
+ setAction { AboutActivity.startActivity(mContext) }
+ subtitle = BuildConfig.VERSION_NAME
+ }
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -715,6 +741,9 @@ open class DrawerFragment : Fragment() {
mNightModeItem,
mKeepScreenOnWhenInForegroundItem,
mThemeColorItem,
+ DrawerMenuGroup(R.string.text_file),
+ mTrashItem,
+ mVersionHistoryItem,
DrawerMenuGroup(R.string.text_about),
mAboutAppAndDevItem,
)
diff --git a/app/src/main/java/org/autojs/autojs/ui/storage/TrashActivity.kt b/app/src/main/java/org/autojs/autojs/ui/storage/TrashActivity.kt
new file mode 100644
index 00000000..e45641e3
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/ui/storage/TrashActivity.kt
@@ -0,0 +1,184 @@
+package org.autojs.autojs.ui.storage
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.afollestad.materialdialogs.MaterialDialog
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import org.autojs.autojs.app.DialogUtils
+import org.autojs.autojs.storage.history.HistoryDatabase
+import org.autojs.autojs.storage.history.TrashEntities
+import org.autojs.autojs.storage.history.TrashRestoreController
+import org.autojs.autojs.ui.BaseActivity
+import org.autojs.autojs6.R
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Trash page.
+ * zh-CN: 回收站页面.
+ *
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+class TrashActivity : BaseActivity() {
+
+ private lateinit var recyclerView: RecyclerView
+
+ private val adapter = TrashAdapter(
+ onClick = { item ->
+ TrashRestoreController(this).startRestoreFlow(item)
+ }
+ )
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ title = getString(R.string.text_trash)
+
+ recyclerView = RecyclerView(this).apply {
+ layoutManager = LinearLayoutManager(this@TrashActivity)
+ adapter = this@TrashActivity.adapter
+ layoutParams = ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ )
+ }
+ setContentView(recyclerView)
+
+ load()
+ }
+
+ private fun load() {
+ Schedulers.io().scheduleDirect {
+ runCatching {
+ val dao = HistoryDatabase.getInstance(applicationContext).historyDao()
+ val items = dao.listTrashItemsDesc()
+
+ AndroidSchedulers.mainThread().scheduleDirect {
+ adapter.submit(items)
+
+ if (items.isEmpty()) {
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(this)
+ .title(R.string.text_prompt)
+ .content(R.string.text_no_data)
+ .positiveText(R.string.dialog_button_dismiss)
+ .positiveColorRes(R.color.dialog_button_default)
+ .cancelable(true)
+ .build()
+ }
+ }
+ }
+ }.onFailure {
+ it.printStackTrace()
+ AndroidSchedulers.mainThread().scheduleDirect {
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(this)
+ .title(R.string.text_prompt)
+ .content(it.message ?: it.toString())
+ .positiveText(R.string.dialog_button_dismiss)
+ .positiveColorRes(R.color.dialog_button_default)
+ .cancelable(true)
+ .build()
+ }
+ }
+ }
+ }
+ }
+
+ companion object {
+ fun startActivity(context: Context) {
+ context.startActivity(
+ Intent(context, TrashActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ )
+ }
+ }
+}
+
+private class TrashAdapter(
+ private val onClick: (TrashEntities.TrashItem) -> Unit,
+) : RecyclerView.Adapter() {
+
+ private var items: List = emptyList()
+
+ fun submit(newItems: List) {
+ items = newItems
+ notifyDataSetChanged()
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TrashViewHolder {
+ return TrashViewHolder.create(parent, onClick)
+ }
+
+ override fun onBindViewHolder(holder: TrashViewHolder, position: Int) {
+ holder.bind(items[position])
+ }
+
+ override fun getItemCount(): Int = items.size
+}
+
+private class TrashViewHolder(
+ itemView: View,
+ private val onClick: (TrashEntities.TrashItem) -> Unit,
+) : RecyclerView.ViewHolder(itemView) {
+
+ private val titleView: TextView = (itemView as LinearLayout).getChildAt(0) as TextView
+ private val subtitleView: TextView = (itemView as LinearLayout).getChildAt(1) as TextView
+
+ private var boundItem: TrashEntities.TrashItem? = null
+
+ fun bind(item: TrashEntities.TrashItem) {
+ boundItem = item
+
+ val name = File(item.originalPath).name
+ titleView.text = name
+
+ val fmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+ val timeText = fmt.format(Date(item.trashedAt))
+ subtitleView.text = "${item.originalPath}\n$timeText"
+
+ itemView.setOnClickListener {
+ boundItem?.let(onClick)
+ }
+ }
+
+ companion object {
+ fun create(parent: ViewGroup, onClick: (TrashEntities.TrashItem) -> Unit): TrashViewHolder {
+ val ctx = parent.context
+
+ val root = LinearLayout(ctx).apply {
+ orientation = LinearLayout.VERTICAL
+ setPadding(32, 24, 32, 24)
+ layoutParams = RecyclerView.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ )
+ gravity = Gravity.CENTER_VERTICAL
+ }
+
+ val title = TextView(ctx).apply {
+ textSize = 16f
+ }
+
+ val subtitle = TextView(ctx).apply {
+ textSize = 12f
+ alpha = 0.75f
+ }
+
+ root.addView(title)
+ root.addView(subtitle)
+
+ return TrashViewHolder(root, onClick)
+ }
+ }
+}
diff --git a/app/src/main/java/org/autojs/autojs/ui/storage/VersionHistoryActivity.kt b/app/src/main/java/org/autojs/autojs/ui/storage/VersionHistoryActivity.kt
new file mode 100644
index 00000000..4c54d2c0
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/ui/storage/VersionHistoryActivity.kt
@@ -0,0 +1,182 @@
+package org.autojs.autojs.ui.storage
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.afollestad.materialdialogs.MaterialDialog
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import org.autojs.autojs.app.DialogUtils
+import org.autojs.autojs.storage.history.HistoryDatabase
+import org.autojs.autojs.storage.history.HistoryEntities
+import org.autojs.autojs.storage.history.VersionHistoryController
+import org.autojs.autojs.ui.BaseActivity
+import org.autojs.autojs6.R
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Version history page (all files).
+ * zh-CN: 版本历史页面 (全部文件).
+ *
+ * Created by JetBrains AI Assistant (GPT-5.2) on Feb 4, 2026.
+ */
+class VersionHistoryActivity : BaseActivity() {
+
+ private lateinit var recyclerView: RecyclerView
+
+ private val adapter = VersionHistoryFileAdapter(
+ onClick = { entry ->
+ VersionHistoryController(this).showForFilePath(entry.logicalPath)
+ }
+ )
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ title = getString(R.string.text_version_history)
+
+ recyclerView = RecyclerView(this).apply {
+ layoutManager = LinearLayoutManager(this@VersionHistoryActivity)
+ adapter = this@VersionHistoryActivity.adapter
+ layoutParams = ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ )
+ }
+ setContentView(recyclerView)
+
+ load()
+ }
+
+ private fun load() {
+ Schedulers.io().scheduleDirect {
+ runCatching {
+ val dao = HistoryDatabase.getInstance(applicationContext).historyDao()
+ val files = dao.listAllFiles().sortedByDescending { it.lastSeenAt }
+
+ AndroidSchedulers.mainThread().scheduleDirect {
+ adapter.submit(files)
+
+ if (files.isEmpty()) {
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(this)
+ .title(R.string.text_prompt)
+ .content(R.string.text_no_data)
+ .positiveText(R.string.dialog_button_dismiss)
+ .positiveColorRes(R.color.dialog_button_default)
+ .cancelable(true)
+ .build()
+ }
+ }
+ }
+ }.onFailure {
+ it.printStackTrace()
+ AndroidSchedulers.mainThread().scheduleDirect {
+ DialogUtils.buildAndShowAdaptive {
+ MaterialDialog.Builder(this)
+ .title(R.string.text_prompt)
+ .content(it.message ?: it.toString())
+ .positiveText(R.string.dialog_button_dismiss)
+ .positiveColorRes(R.color.dialog_button_default)
+ .cancelable(true)
+ .build()
+ }
+ }
+ }
+ }
+ }
+
+ companion object {
+ fun startActivity(context: Context) {
+ context.startActivity(
+ Intent(context, VersionHistoryActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ )
+ }
+ }
+}
+
+private class VersionHistoryFileAdapter(
+ private val onClick: (HistoryEntities.FileEntry) -> Unit,
+) : RecyclerView.Adapter() {
+
+ private var items: List = emptyList()
+
+ fun submit(newItems: List) {
+ items = newItems
+ notifyDataSetChanged()
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VersionHistoryFileViewHolder {
+ return VersionHistoryFileViewHolder.create(parent, onClick)
+ }
+
+ override fun onBindViewHolder(holder: VersionHistoryFileViewHolder, position: Int) {
+ holder.bind(items[position])
+ }
+
+ override fun getItemCount(): Int = items.size
+}
+
+private class VersionHistoryFileViewHolder(
+ itemView: View,
+ private val onClick: (HistoryEntities.FileEntry) -> Unit,
+) : RecyclerView.ViewHolder(itemView) {
+
+ private val titleView: TextView = (itemView as LinearLayout).getChildAt(0) as TextView
+ private val subtitleView: TextView = (itemView as LinearLayout).getChildAt(1) as TextView
+
+ private var boundItem: HistoryEntities.FileEntry? = null
+
+ fun bind(item: HistoryEntities.FileEntry) {
+ boundItem = item
+
+ titleView.text = item.logicalPath
+
+ val fmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+ val timeText = fmt.format(Date(item.lastSeenAt))
+ subtitleView.text = "${item.latestFingerprint}\n$timeText"
+
+ itemView.setOnClickListener {
+ boundItem?.let(onClick)
+ }
+ }
+
+ companion object {
+ fun create(parent: ViewGroup, onClick: (HistoryEntities.FileEntry) -> Unit): VersionHistoryFileViewHolder {
+ val ctx = parent.context
+
+ val root = LinearLayout(ctx).apply {
+ orientation = LinearLayout.VERTICAL
+ setPadding(32, 24, 32, 24)
+ layoutParams = RecyclerView.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ )
+ gravity = Gravity.CENTER_VERTICAL
+ }
+
+ val title = TextView(ctx).apply {
+ textSize = 15f
+ }
+
+ val subtitle = TextView(ctx).apply {
+ textSize = 11f
+ alpha = 0.75f
+ }
+
+ root.addView(title)
+ root.addView(subtitle)
+
+ return VersionHistoryFileViewHolder(root, onClick)
+ }
+ }
+}
diff --git a/app/src/main/res/drawable/ic_recycle_bin.png b/app/src/main/res/drawable/ic_recycle_bin.png
new file mode 100644
index 00000000..b0fb952c
Binary files /dev/null and b/app/src/main/res/drawable/ic_recycle_bin.png differ
diff --git a/app/src/main/res/drawable/ic_version_history.png b/app/src/main/res/drawable/ic_version_history.png
new file mode 100644
index 00000000..ea8f810f
Binary files /dev/null and b/app/src/main/res/drawable/ic_version_history.png differ
diff --git a/app/src/main/res/menu/menu_script_options.xml b/app/src/main/res/menu/menu_script_options.xml
index a28ec36a..9aafbad6 100644
--- a/app/src/main/res/menu/menu_script_options.xml
+++ b/app/src/main/res/menu/menu_script_options.xml
@@ -14,6 +14,9 @@