Merge remote-tracking branch 'origin/master'

# Conflicts: # app/build.gradle.kts # app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
2025-01-01 10:23:31 +08:00
parent cfb8557545 2f8a88822b
commit 0893730440
40 changed files with 2981 additions and 5 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -258,6 +258,9 @@

        <activity android:name="org.autojs.autojs.ui.project.ProjectConfigActivity" />

+        <activity
+            android:name="org.autojs.autojs.ui.keystore.ManageKeyStoreActivity" />
+
        <activity
            android:name="org.autojs.autojs.ui.log.LogActivity"
            android:exported="true"