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 @@ loopers opencv prefill + recents scriptable storages tasker 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 @@ - + @@ -15,7 +15,7 @@ - + @@ -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"> @@ -275,6 +276,7 @@ + = 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); }