From 5cf08a92bfdc3e1761a1d0cc271f9c0e6839d33d Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Mon, 21 Jan 2019 13:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E5=9C=A8=E5=A4=9A=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E5=88=86=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dictionaries/Stardust.xml                |  1 +
 app/src/main/AndroidManifest.xml               |  6 ++++--
 .../org/autojs/autojs/model/script/Scripts.kt  | 14 +++++++-------
 .../autojs/ui/common/ScriptOperations.java     |  2 +-
 .../autojs/autojs/ui/edit/EditActivity.java    | 18 +++++++++++++++---
 .../autojs/ui/explorer/ExplorerView.java       |  2 +-
 .../ui/main/community/CommunityWebView.java    |  2 +-
 .../ui/main/scripts/MyScriptListFragment.java  |  2 +-
 8 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.idea/dictionaries/Stardust.xml b/.idea/dictionaries/Stardust.xml
index 49fb13b7..56bd1478 100644
--- a/.idea/dictionaries/Stardust.xml
+++ b/.idea/dictionaries/Stardust.xml
@@ -11,6 +11,7 @@
       <w>loopers</w>
       <w>opencv</w>
       <w>prefill</w>
+      <w>recents</w>
       <w>scriptable</w>
       <w>storages</w>
       <w>tasker</w>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 816de626..d4521a0c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_SedTORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
     <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
@@ -15,7 +15,7 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
 
 
     <!-- 非Auto.js运行必需，不会主动申请，某些脚本可以自行申请-->
@@ -85,6 +85,7 @@
             android:name=".ui.edit.EditActivity_"
             android:configChanges="orientation|screenSize"
             android:multiprocess="true"
+            android:taskAffinity="org.autojs.autojs.edit"
             android:theme="@style/EditorTheme">
         </activity>
         <activity android:name=".ui.settings.AboutActivity_"/>
@@ -275,6 +276,7 @@
                 <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
+
         <service
             android:name="com.stardust.notification.NotificationListenerService"
             android:label="@string/app_name"
diff --git a/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt b/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
index c81870d0..15f3d3de 100644
--- a/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
+++ b/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
@@ -91,22 +91,22 @@ object Scripts {
     }
 
 
-    fun edit(file: ScriptFile) {
-        EditActivity.editFile(GlobalAppContext.get(), file.simplifiedName, file.path)
+    fun edit(context: Context, file: ScriptFile) {
+        EditActivity.editFile(context, file.simplifiedName, file.path)
     }
 
-    fun edit(path: String) {
-        edit(ScriptFile(path))
+    fun edit(context: Context, path: String) {
+        edit(context, ScriptFile(path))
     }
 
     fun run(file: ScriptFile): ScriptExecution? {
-        try {
-            return AutoJs.getInstance().scriptEngineService.execute(file.toSource(),
+        return try {
+            AutoJs.getInstance().scriptEngineService.execute(file.toSource(),
                     ExecutionConfig(workingDirectory = file.parent))
         } catch (e: Exception) {
             e.printStackTrace()
             Toast.makeText(GlobalAppContext.get(), e.message, Toast.LENGTH_LONG).show()
-            return null
+            null
         }
 
     }
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 d695f8b8..91f44aed 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
@@ -114,7 +114,7 @@ public class ScriptOperations {
             }
             notifyFileCreated(mCurrentDirectory, new ScriptFile(path));
             if (edit)
-                Scripts.INSTANCE.edit(path);
+                Scripts.INSTANCE.edit(mContext, path);
         } else {
             showMessage(R.string.text_create_fail);
         }
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
index f6efb489..a8fdd3b2 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
@@ -4,9 +4,12 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -195,7 +198,15 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
             showExitConfirmDialog();
             return;
         }
-        super.finish();
+        finishAndRemoveFromRecents();
+    }
+
+    private void finishAndRemoveFromRecents() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
     }
 
     private void showExitConfirmDialog() {
@@ -207,9 +218,9 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
                 .neutralText(R.string.text_exit_directly)
                 .onNegative((dialog, which) -> {
                     mEditorView.saveFile();
-                    EditActivity.super.finish();
+                    finishAndRemoveFromRecents();
                 })
-                .onNeutral((dialog, which) -> EditActivity.super.finish())
+                .onNeutral((dialog, which) -> finishAndRemoveFromRecents())
                 .show();
     }
 
@@ -294,4 +305,5 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         mRequestPermissionCallbacks.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
+
 }
diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
index 9ef8ae67..e4155f85 100644
--- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
@@ -557,7 +557,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
 
         @OnClick(R.id.edit)
         void edit() {
-            Scripts.INSTANCE.edit(new ScriptFile(mExplorerItem.getPath()));
+            Scripts.INSTANCE.edit(getContext(), new ScriptFile(mExplorerItem.getPath()));
             notifyOperated();
         }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
index 032e40c4..a2a96a50 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
@@ -75,7 +75,7 @@ public class CommunityWebView extends EWebView {
                 .subscribe(file ->
                                 Snackbar.make(CommunityWebView.this, getResources().getString(R.string.format_file_downloaded, file.getPath())
                                         , Snackbar.LENGTH_LONG)
-                                        .setAction(R.string.text_open, v -> Scripts.INSTANCE.edit(file))
+                                        .setAction(R.string.text_open, v -> Scripts.INSTANCE.edit(getContext(), file))
                                         .show(),
                         error -> {
                             error.printStackTrace();
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
index bc6cb785..3ec2a9dc 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
@@ -62,7 +62,7 @@ public class MyScriptListFragment extends ViewPagerFragment implements FloatingA
         mExplorerView.setExplorer(Explorers.workspace(), ExplorerDirPage.createRoot(Pref.getScriptDirPath()));
         mExplorerView.setOnItemClickListener((view, item) -> {
             if (item.isEditable()) {
-                Scripts.INSTANCE.edit(item.toScriptFile());
+                Scripts.INSTANCE.edit(getActivity(), item.toScriptFile());
             } else {
                 IntentUtil.viewFile(GlobalAppContext.get(), item.getPath(), AppFileProvider.AUTHORITY);
             }