[WIP] Introduce an 'updated' APK packages flavor

2021-05-12 20:23:39 +02:00
180 changed files with 3771 additions and 13649 deletions
@@ -1,5 +1,5 @@
 *           text=auto
-*.bat       text eol=crlf
-*.gradle    text eol=lf
-*.mk        text eol=lf
-*.sh        text eol=lf
+*.bat       eol=crlf
+*.gradle    eol=lf
+*.mk        eol=lf
+*.sh        eol=lf
@@ -1,44 +0,0 @@
-name: "Bug report"
-description: "Create a report to help us improve"
-title: "[Bug]: "
-labels: ["bug report"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This is a bug tracker of the Termux app. If you have issues with a package inside the app, then please open an issue at [termux-packages](https://github.com/termux/termux-packages) instead.
-
-        Use search before you open an issue to check whether your issue has been already reported and perhaps solved.
-
-        Android versions 5.x and 6.x are not supported anymore.
-
-        If you have issues installing packages then please see https://github.com/termux/termux-packages/issues/6726.
-  - type: textarea
-    attributes:
-      label: Problem description
-      description: |
-        A clear and concise description of what the problem is. You may attach the logs, screenshots, screen video recording and whatever else that will help to understand the issue.
-
-        Issues without proper description will be closed without solution.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps to reproduce the behavior.
-      description: |
-        Please post all necessary commands that are needed to reproduce the issue.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: What is the expected behavior?
-  - type: textarea
-    attributes:
-      label: System information
-      description: Please provide info about your device
-      value: |
-        * Termux application version:
-        * Android OS version:
-        * Device model:
-    validations:
-      required: true
@@ -1,19 +0,0 @@
-name: "Feature request"
-description: "Suggest a new feature for Termux application"
-title: "[Feature]: "
-labels: ["feature request"]
-body:
-  - type: textarea
-    attributes:
-      label: Feature description
-      description: Describe the feature and why you want it.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional information
-      description: |
-        Does another app/terminal emulator have this feature?
-        Provide links to more background information.
-    validations:
-      required: true
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve Termux application
+
+---
+
+<!--
+IMPORTANT:
+
+1. Support of Android 5.x - 6.x is finished.
+2. Fill the template AFTER comments.
+-->
+
+**Problem description**
+<!--
+A clear and concise description of what the problem is.
+You may post screenshots in addition to description.
+-->
+
+**Steps to reproduce**
+<!--
+Steps to reproduce the behavior. Please post all necessary
+commands that are needed to reproduce the issue.
+-->
+
+**Expected behavior**
+<!--
+A clear and concise description of what you expected to happen.
+-->
+
+**Additional information**
+
+* Termux application version:
+* Android OS version:
+* Device model:
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Want ask questions about the project?
-    url: https://github.com/termux/termux-app/discussions
-    about: Join GitHub Discussions
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest a new feature for Termux application
+
+---
+
+<!--
+IMPORTANT:
+
+1. Support of Android 5.x - 6.x is finished.
+2. Fill the template AFTER comments.
+-->
+
+**Feature description**
+<!--
+Describe the feature and why you want it.
+-->
+
+**Reference implementation**
+
+Does another app/terminal emulator have this feature?
+Provide links to more background information.
@@ -1,36 +0,0 @@
-name: Attach Debug APKs To Release
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Set tag
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
-      - name: Clone repository
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.GITHUB_REF }}
-      - name: Build
-        env:
-          RELEASE_TAG: ${{ steps.vars.outputs.tag }}
-        run: ./gradlew assembleDebug
-      - name: Attach debug APKs to release
-        env:
-          RELEASE_TAG: ${{ steps.vars.outputs.tag }}
-        run: >-
-          hub release edit
-          -m ""
-          -a ./app/build/outputs/apk/debug/termux-app-universal-$RELEASE_TAG-debug.apk
-          -a ./app/build/outputs/apk/debug/termux-app-arm64-v8a-$RELEASE_TAG-debug.apk
-          -a ./app/build/outputs/apk/debug/termux-app-armeabi-v7a-$RELEASE_TAG-debug.apk
-          -a ./app/build/outputs/apk/debug/termux-app-x86_64-$RELEASE_TAG-debug.apk
-          -a ./app/build/outputs/apk/debug/termux-app-x86-$RELEASE_TAG-debug.apk
-          $RELEASE_TAG
@@ -19,38 +19,8 @@ jobs:
    - name: Build
      run: |
        ./gradlew assembleDebug
-    - name: Store generated universal APK file
+    - name: Store generated APK file
      uses: actions/upload-artifact@v2
      with:
-        name: termux-app-universal
-        path: |
-            ./app/build/outputs/apk/debug/termux-app-universal-debug.apk
-            ./app/build/outputs/apk/debug/output-metadata.json
-    - name: Store generated arm64-v8a APK file
-      uses: actions/upload-artifact@v2
-      with:
-        name: termux-app-arm64-v8a
-        path: |
-          ./app/build/outputs/apk/debug/termux-app-arm64-v8a-debug.apk
-          ./app/build/outputs/apk/debug/output-metadata.json
-    - name: Store generated armeabi-v7a APK file
-      uses: actions/upload-artifact@v2
-      with:
-        name: termux-app-armeabi-v7a
-        path: |
-          ./app/build/outputs/apk/debug/termux-app-armeabi-v7a-debug.apk
-          ./app/build/outputs/apk/debug/output-metadata.json
-    - name: Store generated x86_64 APK file
-      uses: actions/upload-artifact@v2
-      with:
-        name: termux-app-x86_64
-        path: |
-          ./app/build/outputs/apk/debug/termux-app-x86_64-debug.apk
-          ./app/build/outputs/apk/debug/output-metadata.json
-    - name: Store generated x86 APK file
-      uses: actions/upload-artifact@v2
-      with:
-        name: termux-app-x86
-        path: |
-          ./app/build/outputs/apk/debug/termux-app-x86-debug.apk
-          ./app/build/outputs/apk/debug/output-metadata.json
+        name: termux-app
+        path: ./app/build/outputs/apk/debug
@@ -0,0 +1,26 @@
+name: Publish library packages
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - 'terminal-emulator/build.gradle'
+    - 'terminal-view/build.gradle'
+    - 'termux-shared/build.gradle'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+    - name: Perform release build
+      run: |
+        ./gradlew assembleRelease
+    - name: Publish libraries on Github Packages
+      env:
+        GH_USERNAME: xeffyr
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      run: |
+        ./gradlew publish
@@ -1,24 +0,0 @@
-name: Trigger Termux Library Builds on Jitpack
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set tag
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\/v/}
-      - name: Echo tag
-        run: echo "Triggering termux library builds on jitpack for '${{ steps.vars.outputs.tag }}' after waiting for 3 mins"
-      - name: Trigger termux library builds on jitpack
-        env:
-          RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
-        run: |
-          sleep 180 # It will take some time for the new tag to be detected by Jitpack
-          curl --max-time 600 --no-progress-meter https://jitpack.io/com/termux/termux-app/terminal-emulator/$RELEASE_VERSION/terminal-emulator-$RELEASE_VERSION.pom
-          curl --max-time 600 --no-progress-meter https://jitpack.io/com/termux/termux-app/terminal-view/$RELEASE_VERSION/terminal-view-$RELEASE_VERSION.pom
-          curl --max-time 600 --no-progress-meter https://jitpack.io/com/termux/termux-app/termux-shared/$RELEASE_VERSION/termux-shared-$RELEASE_VERSION.pom
@@ -4,7 +4,6 @@

 # Built application files
 build/
-release/
 *.apk
 *.so
 .externalNativeBuild
@@ -2,5 +2,6 @@ The `termux/termux-app` repository is released under [GPLv3 only](https://www.gn

 ### Exceptions

- [Terminal Emulator for Android](https://github.com/jackpal/Android-Terminal-Emulator) code is used which is released under [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). Check [`terminal-view`](terminal-view) and [`terminal-emulator`](terminal-emulator) libraries.
- Check [`termux-shared/LICENSE.md`](termux-shared/LICENSE.md) for `termux-shared` library related exceptions.
+- [Terminal Emulator for Android](https://github.com/jackpal/Android-Terminal-Emulator) code is used which is released under [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). Check [terminal-view](terminal-view) and [terminal-emulator](terminal-emulator) modules.
+- [libcore/ojluni](https://cs.android.com/android/platform/superproject/+/android-11.0.0_r3:libcore/ojluni/) code is used which is released under [GPLv2 only with "Classpath" exception](https://openjdk.java.net/legal/gplv2+ce.html). Check `com.termux.shared.file` package under [termux-shared](termux-shared) module.
+- [libsuperuser ](https://github.com/Chainfire/libsuperuser) code is used which is released under [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). Check `com.termux.shared.shell.StreamGobbler` class under [termux-shared](termux-shared) module.
@@ -1,11 +1,8 @@
-# Termux application - The Marc way
+# Termux application

 [![Build status](https://github.com/termux/termux-app/workflows/Build/badge.svg)](https://github.com/termux/termux-app/actions)
 [![Testing status](https://github.com/termux/termux-app/workflows/Unit%20tests/badge.svg)](https://github.com/termux/termux-app/actions)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)
-[![Join the Termux discord server](https://img.shields.io/discord/641256914684084234.svg?label=&logo=discord&logoColor=ffffff&color=5865F2)](https://discord.gg/HXpF69X)
-[![Termux library releases at Jitpack](https://jitpack.io/v/termux/termux-app.svg)](https://jitpack.io/#termux/termux-app)
-

 [Termux](https://termux.com) is an Android terminal application and Linux environment.

@@ -15,7 +12,7 @@ Quick how-to about Termux package management is available at [Package Management

 ***

-**@termux is looking for Termux Application maintainers for implementing new features, fixing bugs and reviewing pull requests since the current one (@fornwall) is inactive.**
+**@termux is looking for Termux Application maintainers for implementing new features, fixing bugs and reviewing pull requests since current one (@fornwall) is inactive.**

 Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.

@@ -26,8 +23,7 @@ Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
 - [Installation](#Installation)
 - [Uninstallation](#Uninstallation)
 - [Important Links](#Important-Links)
- [For Maintainers and Contributors](#For-Maintainers-and-Contributors)
- [Forking](#Forking)
+- [For Devs and Contributors](#For-Devs-and-Contributors)
 ##


@@ -50,79 +46,36 @@ The core [Termux](https://github.com/termux/termux-app) app comes with the follo

 Termux can be obtained through various sources listed below for **only** Android `>= 7`. Support was dropped for Android `5` and `6` on [2020-01-01](https://www.reddit.com/r/termux/comments/dnzdbs/end_of_android56_support_on_20200101/) at `v0.83`, old builds are available on [archive.org](https://archive.org/details/termux-repositories-legacy).

-The APK files of different sources are signed with different signature keys. The `Termux` app and all its plugins use the same [`sharedUserId`](https://developer.android.com/guide/topics/manifest/manifest-element) `com.termux` and so all their APKs installed on a device must have been signed with the same signature key to work together and so they must all be installed from the same source. Do not attempt to mix them together, i.e do not try to install an app or plugin from `F-Droid` and another one from a different source like `Github`. Android Package Manager will also normally not allow installation of APKs with different signatures and you will get errors on installation like `App not installed`, `Failed to install due to an unknown error`, `INSTALL_FAILED_UPDATE_INCOMPATIBLE`, `INSTALL_FAILED_SHARED_USER_INCOMPATIBLE`, `signatures do not match previously installed version`, etc. This restriction can be bypassed with root or with custom roms.
+The APK files of different sources are signed with different signature keys. The `Termux` app and all its plugins use the same [sharedUserId](https://developer.android.com/guide/topics/manifest/manifest-element) `com.termux` and so all their APKs installed on a device must have been signed with the same signature key to work together and so they must all be installed from the same source. Do not attempt to mix them together, i.e do not try to install an app or plugin from F-Droid and another one from a different source. Android Package Manager will also normally not allow installation of APKs with a different signatures and you will get errors on installation like `App not installed`, `Failed to install due to an unknown error`, `INSTALL_FAILED_UPDATE_INCOMPATIBLE`, `INSTALL_FAILED_SHARED_USER_INCOMPATIBLE`, `signatures do not match previously installed version`, etc. This restriction can be bypassed with root or with custom roms.

-If you wish to install from a different source, then you must **uninstall any and all existing Termux or its plugin app APKs** from your device first, then install all new APKs from the same new source. Check [Uninstallation](#Uninstallation) section for details. You may also want to consider [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux) before the uninstallation so that you can restore it after re-installing from Termux different source.
-
-In the following paragraphs, *"bootstrap"* refers to the minimal packages that are shipped with the `termux-app` itself to start a working shell environment. Its zips are built and released [here](https://github.com/termux/termux-packages/releases).
+If you wish to install from a different source, then you must uninstall **any and all existing Termux or its plugin app APKs** from your device first, then install all new APKs from the same new source. Check [Uninstallation](#Uninstallation) section for details. You may also want to consider [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux) before uninstallation.

 ### F-Droid

-Termux application can be obtained from `F-Droid` from [here](https://f-droid.org/en/packages/com.termux/).
+Termux application can be obtained from F-Droid [here](https://f-droid.org/en/packages/com.termux/). It usually takes a few days (or even a week or more) for updates to be available on F-Droid once an update has been released on Github. F-Droid releases are built and published by F-Droid once they detect a new Github release. The Termux maintainers **do not** have any control over building and publishing of Termux app on F-Droid. Moreover, the Termux maintainers also do not have access to the APK signing keys of F-Droid releases, so we cannot release an APK ourselves on Github that would be compatible with F-Droid releases.

-You **do not** need to download the `F-Droid` app (via the `Download F-Droid` link) to install Termux. You can download the Termux APK directly from the site by clicking the `Download APK` link at the bottom of each version section.
+### Debug Builds

-It usually takes a few days (or even a week or more) for updates to be available on `F-Droid` once an update has been released on `Github`. The `F-Droid` releases are built and published by `F-Droid` once they [detect](https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/com.termux.yml) a new `Github` release. The Termux maintainers **do not** have any control over the building and publishing of the Termux apps on `F-Droid`. Moreover, the Termux maintainers also do not have access to the APK signing keys of `F-Droid` releases, so we cannot release an APK ourselves on `Github` that would be compatible with `F-Droid` releases.
+For users who don't want to wait for F-Droid releases and want to try out the latest features immediately or want to test their pull requests can get the APKs from [Github Actions](https://github.com/termux/termux-app/actions) page from the workflow runs labeled `Build`. The APK will be listed under `Artifacts` section. These are published for each commit done to the repository. These APKs are [debuggable](https://developer.android.com/studio/debug) and are also not compatible with other sources.

-Only a universal APK is released, which will work on all supported architectures. The APK and bootstrap installation size will be `~180MB`. `F-Droid` does [not support](https://github.com/termux/termux-app/pull/1904) architecture specific APKs.
+### Google Playstore **(Deprecated)**

-### Github
-
-Termux application can be obtained on `Github` either from [`Github Releases`](https://github.com/termux/termux-app/releases) for `>= v0.118` or from [`Github Build`](https://github.com/termux/termux-app/actions/workflows/debug_build.yml) action workflows.
-
-The APKs for `Github Releases` will be listed under `Assets` drop-down of a release. These are automatically attached when a new version is released.
-
-The APKs for `Github Build` action workflows will be listed under `Artifacts` section of a workflow run. These are created for each commit/push done to the repository and can be used by users who don't want to wait for releases and want to try out the latest features immediately or want to test their pull requests.
-
-The APKs for both of these are [`debuggable`](https://developer.android.com/studio/debug) and are compatible with each other but they are not compatible with other sources.
-
-Both universal and architecture specific APKs are released. The APK and bootstrap installation size will be `~180MB` if using universal and `~120MB` if using architecture specific. Check [here](https://github.com/termux/termux-app/issues/2153) for details.
-
-### Google Play Store **(Deprecated)**
-
-**Termux and its plugins are no longer updated on [Google Play Store](https://play.google.com/store/apps/details?id=com.termux) due to [android 10 issues](https://github.com/termux/termux-packages/wiki/Termux-and-Android-10) and have been deprecated.** The last version released for Android `>= 7` was `v0.101`. **It is highly recommended to not install Termux apps from Play Store any more.**
-
-There are plans for **unpublishing** the Termux app and all its plugins on Play Store soon so that new users cannot install it and for **disabling** the Termux apps with updates so that existing users **cannot continue using outdated versions**. You are encouraged to move to `F-Droid` or `Github` builds as soon as possible.
-
-You **will not need to buy plugins again** if you bought them on Play Store. All plugins are free on `F-Droid` and  `Github`.
-
-You can backup all your data under `$HOME/` and `$PREFIX/` before changing installation source, and then restore it afterwards, by following instructions at [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux) before the uninstallation.
-
-There is currently no work being done to solve android `10` issues and *working* updates will not be resumed on Google Play Store any time soon. We will continue targeting sdk `28` for now. So there is not much point in staying on Play Store builds and waiting for updates to be resumed. If for some reason you don't want to move to `F-Droid` or `Github` sources for now, then at least check [Package Management](https://github.com/termux/termux-packages/wiki/Package-Management) to **change your mirror**, otherwise, you will get **`repository is under maintenance or down`** errors when running `apt` or `pkg` commands. After that, it is also **highly advisable** to run `pkg upgrade` command to update all packages to the latest available versions, or at least update `termux-tools` package with `pkg install termux-tools` command.
-
-If you plan on staying on Play Store sources in future as well, then you may want to **disable automatic updates in Play Store** for Termux apps, since if and when updates to disable Termux apps are released, then **you will not be able to downgrade** and **will be forced** to move since apps won't work anymore. Only a way to backup `termux-app` data may be provided.
-
-#### Why Disable?
-
-<details>
-<summary></summary>
-
- They should be disabled because deprecated things get removed and are not supported after some time, its the standard practice. It has been many months now since deprecation was announced and updates have not been released on Play Store since after `29 September 2020`.
-
- The new versions have lots of **new features and fixes** which you can mostly check out in the Changelog of [`Github Releases`](https://github.com/termux/termux-app/releases) that you may be missing out. Extra detail is usually provided in [commit messages](https://github.com/termux/termux-app/commits/master).
-
- Users on old versions are quite often reporting issues in multiple repositories and support forums that were **fixed months ago**, which we then have to deal with. The maintainers of @termux work in their free time, majorly for free, to work on development and provide support and having to re-re-deal with old issues takes away the already limited time from current work and is not possible to continue doing. Play Store page of `termux-app` has been filled with bad reviews of *"broken app"*, even though its clearly mentioned on the page that app is not being updated, yet users don't read and still install and report issues.
-
- Asking people to pay for plugins when the `termux-app` at installation time is broken due to repository issues and has bugs is unethical.
-
- Old versions don't have proper logging/debugging and crash report support. Reporting bugs without logs or detailed info is not helpful in solving them.
-
- It's also easier for us to solve package related issues and provide custom functionality with app updates, which can't be done if users continue using old versions. For example, the [bintray shudown](https://github.com/termux/termux-packages/wiki/Package-Management) causing package install/update failures for new Play Store users is/was not an issue for F-Droid users since it is being shipped with updated bootstrap and repo info, hence no reported issues from new F-Droid users.
-</details>
+**Termux and its plugins are no longer updated on [Google playstore](https://play.google.com/store/apps/details?id=com.termux) due to [android 10 issues](https://github.com/termux/termux-packages/wiki/Termux-and-Android-10).** The last version released for Android `>= 7` was `v0.101`. There are currently no immediate plans to resume updates on Google playstore. **It is highly recommended to not install Termux from playstore for now.** Any current users **should switch** to a different source like F-Droid.

+If for some reason you don't want to switch, then at least check [Package Management](https://github.com/termux/termux-packages/wiki/Package-Management) to **change your mirror**, otherwise you will get **`repository is under maintenance or down`** errors when running `apt` or `pkg` commands. After that, it is also **highly advisable** to run `pkg upgrade` command to update all packages to the latest available versions, or at least update `termux-tools` package with `pkg install termux-tools` command.
 ##



 ## Uninstallation

-Uninstallation may be required if a user doesn't want Termux installed in their device anymore or is switching to a different [install source](#Installation). You may also want to consider [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux) before the uninstallation.
+Uninstallation may be required if a user doesn't want Termux installed in their device anymore or is switching to a different [install source](#Installation). You may also want to consider [Backing up Termux](https://wiki.termux.com/wiki/Backing_up_Termux) before uninstallation.

 To uninstall Termux completely, you must uninstall **any and all existing Termux or its plugin app APKs** listed in [Termux App and Plugins](#Termux-App-and-Plugins).

-Go to `Android Settings` -> `Applications` and then look for those apps. You can also use the search feature if it’s available on your device and search `termux` in the applications list.
+Go to `Android Settings` -> `Applications` and then look for those apps. You can also use the search feature if its available on your device and search `termux` in the applications list.

-Even if you think you have not installed any of the plugins, it's strongly suggested to go through the application list in Android settings and double-check.
+Even if you think you have not installed any of the plugins, its strongly suggesting to go through the application list in Android settings and double check.
 ##


@@ -137,7 +90,7 @@ The main ones are the following.
 - [Termux Reddit community](https://reddit.com/r/termux)
 - [Termux Matrix Channel](https://matrix.to/#termux_termux:gitter.im)
 - [Termux Dev Matrix Channel](https://matrix.to/#termux_dev:gitter.im)
- [Termux Twitter](https://twitter.com/termux/)
+- [Termux Twitter](http://twitter.com/termux/)
 - [Termux Reports Email](mailto:termuxreports@groups.io)

 ### Wikis
@@ -158,64 +111,35 @@ The main ones are the following.
 - [Android Storage and Sharing Data with Other Apps](https://wiki.termux.com/wiki/Internal_and_external_storage)
 - [Android APIs](https://wiki.termux.com/wiki/Termux:API)
 - [Moved Termux Packages Hosting From Bintray to IPFS](https://github.com/termux/termux-packages/issues/6348)
- [Running Commands in Termux From Other Apps via `RUN_COMMAND` intent](https://github.com/termux/termux-app/wiki/RUN_COMMAND-Intent)
 - [Termux and Android 10](https://github.com/termux/termux-packages/wiki/Termux-and-Android-10)

-
-### Terminal
-
-<details>
-<summary></summary>
-
 ### Terminal resources

- [XTerm control sequences](https://invisible-island.net/xterm/ctlseqs/ctlseqs.html)
- [vt100.net](https://vt100.net/)
- [Terminal codes (ANSI and terminfo equivalents)](https://wiki.bash-hackers.org/scripting/terminalcodes)
+- [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)
+- [vt100.net](http://vt100.net/)
+- [Terminal codes (ANSI and terminfo equivalents)](http://wiki.bash-hackers.org/scripting/terminalcodes)

 ### Terminal emulators

 - VTE (libvte): Terminal emulator widget for GTK+, mainly used in gnome-terminal. [Source](https://github.com/GNOME/vte), [Open Issues](https://bugzilla.gnome.org/buglist.cgi?quicksearch=product%3A%22vte%22+), and [All (including closed) issues](https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&chfield=resolution&chfieldfrom=-2000d&chfieldvalue=FIXED&product=vte&resolution=FIXED).

- iTerm 2: OS X terminal application. [Source](https://github.com/gnachman/iTerm2), [Issues](https://gitlab.com/gnachman/iterm2/issues) and [Documentation](https://iterm2.com/documentation.html) (which includes [iTerm2 proprietary escape codes](https://iterm2.com/documentation-escape-codes.html)).
+- iTerm 2: OS X terminal application. [Source](https://github.com/gnachman/iTerm2), [Issues](https://gitlab.com/gnachman/iterm2/issues) and [Documentation](http://www.iterm2.com/documentation.html) (which includes [iTerm2 proprietary escape codes](http://www.iterm2.com/documentation-escape-codes.html)).

 - Konsole: KDE terminal application. [Source](https://projects.kde.org/projects/kde/applications/konsole/repository), in particular [tests](https://projects.kde.org/projects/kde/applications/konsole/repository/revisions/master/show/tests), [Bugs](https://bugs.kde.org/buglist.cgi?bug_severity=critical&bug_severity=grave&bug_severity=major&bug_severity=crash&bug_severity=normal&bug_severity=minor&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=konsole) and [Wishes](https://bugs.kde.org/buglist.cgi?bug_severity=wishlist&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=konsole).

 - hterm: JavaScript terminal implementation from Chromium. [Source](https://github.com/chromium/hterm), including [tests](https://github.com/chromium/hterm/blob/master/js/hterm_vt_tests.js), and [Google group](https://groups.google.com/a/chromium.org/forum/#!forum/chromium-hterm).

- xterm: The grandfather of terminal emulators. [Source](https://invisible-island.net/datafiles/release/xterm.tar.gz).
+- xterm: The grandfather of terminal emulators. [Source](http://invisible-island.net/datafiles/release/xterm.tar.gz).

 - Connectbot: Android SSH client. [Source](https://github.com/connectbot/connectbot)

 - Android Terminal Emulator: Android terminal app which Termux terminal handling is based on. Inactive. [Source](https://github.com/jackpal/Android-Terminal-Emulator).
-</details>
-
 ##



-## For Maintainers and Contributors
+## For Devs and Contributors

-The [termux-shared](termux-shared) library was added in [`v0.109`](https://github.com/termux/termux-app/releases/tag/v0.109). It defines shared constants and utils of the Termux app and its plugins. It was created to allow for the removal of all hardcoded paths in the Termux app. Some of the termux plugins are using this as well and rest will in future. If you are contributing code that is using a constant or a util that may be shared, then define it in `termux-shared` library if it currently doesn't exist and reference it from there. Update the relevant changelogs as well. Pull requests using hardcoded values **will/should not** be accepted.
+The [termux-shared](termux-shared) library was added in [`v0.109`](https://github.com/termux/termux-app/releases/tag/v0.109). It defines shared constants and utils of Termux app and its plugins. It was created to allow for removal of all hardcoded paths in Termux app. The termux plugins will hopefully use this in future as well. If you are contributing code that is using a constant or a util that may be shared, then define it in `termux-shared` library if it currently doesn't exist and reference it from there. Update the relevant changelogs as well. Pull requests using hardcoded values **will/should not** be accepted.

 The main Termux constants are defined by [`TermuxConstants`](https://github.com/termux/termux-app/blob/master/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java) class. It also contains information on how to fork Termux or build it with your own package name. Changing the package name will require building the bootstrap zip packages and other packages with the new `$PREFIX`, check [Building Packages](https://github.com/termux/termux-packages/wiki/Building-packages) for more info.
-
-Check [Termux Libraries](https://github.com/termux/termux-app/wiki/Termux-Libraries) for how to import termux libraries in plugin apps and [Forking and Local Development](https://github.com/termux/termux-app/wiki/Termux-Libraries#forking-and-local-development) for how to update termux libraries for plugins.
-
-Commit messages should preferably use [Conventional Commits](https://www.conventionalcommits.org) specs. Use the following `types` as `Added: Add foo`, `Added|Fixed: Add foo and fix bar`, `Changed!: Change baz as a breaking change`, etc. This should also allow automated generation of Changelogs in future.
-
- **Added** for new features.
- **Changed** for changes in existing functionality.
- **Deprecated** for soon-to-be removed features.
- **Removed** for now removed features.
- **Fixed** for any bug fixes.
- **Security** in case of vulnerabilities.
-
-Changelogs for releases are generated based on [Keep a Changelog](https://github.com/olivierlacan/keep-a-changelog) specs.
-
-## Forking
-
- Check [`TermuxConstants`](https://github.com/termux/termux-app/blob/master/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java) javadocs for instructions on what changes to make in the app to change package name.
- You also need to recompile bootstrap zip for the new package name. Check [here](https://github.com/termux/termux-app/issues/1983) and [here](https://github.com/termux/termux-app/issues/2081#issuecomment-865280111) for experimental work on it.
- Currently, not all plugins use `TermuxConstants` from `termux-shared` library and have hardcoded `com.termux` values and will need to be manually patched.
- If forking termux plugins, check [Forking and Local Development](https://github.com/termux/termux-app/wiki/Termux-Libraries#forking-and-local-development) for info on how to use termux libraries for plugins.
@@ -1,14 +1,26 @@
 plugins {
-    id "com.android.application"
+  id "com.android.application"
 }

 android {
+    flavorDimensions "version"
+    productFlavors {
+        current {
+            dimension "version"
+            targetSdkVersion project.properties.targetSdkVersion.toInteger()
+        }
+        updated {
+            dimension "version"
+            targetSdkVersion project.properties.updatedTargetSdkVersion.toInteger()
+        }
+    }
+
    compileSdkVersion project.properties.compileSdkVersion.toInteger()
-    ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
+    ndkVersion project.properties.ndkVersion

    dependencies {
        implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.6.0-rc01"
+        implementation "androidx.core:core:1.5.0-rc01"
        implementation "androidx.drawerlayout:drawerlayout:1.1.1"
        implementation "androidx.preference:preference:1.1.1"
        implementation "androidx.viewpager:viewpager:1.0.0"
@@ -25,9 +37,8 @@ android {
    defaultConfig {
        applicationId "com.termux"
        minSdkVersion project.properties.minSdkVersion.toInteger()
-        targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 117
-        versionName "0.117"
+        versionCode 112
+        versionName "0.112"

        manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
        manifestPlaceholders.TERMUX_APP_NAME = "Termux"
@@ -44,14 +55,10 @@ android {
            }
        }

-        splits {
-            abi {
-                enable gradle.startParameter.taskNames.any { it.contains("Debug") }
-                reset ()
-                include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-                universalApk true
-            }
+        ndk {
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
        }
+
    }

    signingConfigs {
@@ -66,7 +73,7 @@ android {
    buildTypes {
        release {
            minifyEnabled true
-            shrinkResources false // Reproducible builds
+            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }

@@ -95,23 +102,6 @@ android {
            includeAndroidResources = true
        }
    }
-
-    packagingOptions {
-        jniLibs {
-            useLegacyPackaging true
-        }
-    }
-
-    applicationVariants.all { variant ->
-        variant.outputs.all { output ->
-            if (variant.buildType.name == "debug") {
-                def abi = output.getFilter(com.android.build.OutputFile.ABI)
-                def releaseTag = System.getenv("RELEASE_TAG")
-                outputFileName = new File("termux-app-" + (abi ? abi : "universal") + (releaseTag ? "-" + releaseTag : "") + "-debug.apk")
-            }
-        }
-    }
-
 }

 dependencies {
@@ -120,16 +110,67 @@ dependencies {
 }

 task versionName {
-    doLast {
-        print android.defaultConfig.versionName
-    }
+  doLast {
+    print android.defaultConfig.versionName
+  }
 }

-def downloadBootstrap(String arch, String expectedChecksum, String version) {
+def expandBootstrap(File bootstrapZip, String expectedChecksum, String arch) {
+    def doneMarkerFile = new File(bootstrapZip.getAbsolutePath() + "." + expectedChecksum + ".done")
+    if (doneMarkerFile.exists()) return
+
+    def archDirName
+    if (arch == "aarch64") archDirName = "arm64-v8a";
+    if (arch == "arm") archDirName = "armeabi-v7a";
+    if (arch == "i686") archDirName = "x86";
+    if (arch == "x86_64") archDirName = "x86_64";
+
+    def outputPath = project.getRootDir().getAbsolutePath() + "/app/src/main/jniLibs/" + archDirName + "/"
+    def outputDir = new File(outputPath).getAbsoluteFile()
+    if (!outputDir.exists()) outputDir.mkdirs()
+
+    def symlinksFile = new File(outputDir, "libsymlinks.so").getAbsoluteFile()
+    if (symlinksFile.exists()) symlinksFile.delete();
+
+    def mappingsFile = new File(outputDir, "libfiles.so").getAbsoluteFile()
+    if (mappingsFile.exists()) mappingsFile.delete()
+    mappingsFile.createNewFile()
+    def mappingsFileWriter = new BufferedWriter(new FileWriter(mappingsFile))
+
+    def counter = 100
+    new java.util.zip.ZipInputStream(new FileInputStream(bootstrapZip)).withCloseable { zipInput ->
+        def zipEntry
+        while ((zipEntry = zipInput.getNextEntry()) != null) {
+            if (zipEntry.getName() == "SYMLINKS.txt") {
+                zipInput.transferTo(new FileOutputStream(symlinksFile))
+            } else if (!zipEntry.isDirectory()) {
+                def soName = "lib" + counter + ".so"
+                def targetFile = new File(outputDir, soName).getAbsoluteFile()
+
+                println "target file path is ${targetFile}"
+
+                try {
+                    zipInput.transferTo(new FileOutputStream(targetFile))
+                } catch (Exception e) {
+                    println "Error ${e}"
+                }
+
+
+                mappingsFileWriter.writeLine(soName + "←" + zipEntry.getName())
+                counter++
+            }
+        }
+    }
+
+    mappingsFileWriter.close()
+    doneMarkerFile.createNewFile()
+}
+
+def downloadBootstrap(String arch, String expectedChecksum, String version, boolean isPackagesInApk) {
    def digest = java.security.MessageDigest.getInstance("SHA-256")

-    def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
-    def file = new File(projectDir, localUrl)
+    def file = isPackagesInApk ? new File(project.buildDir, "./gradle/bootstrap-" + arch + "-" + version + ".zip")
+        : new File(projectDir, "src/main/cpp/bootstrap-" + arch + ".zip");
    if (file.exists()) {
        def buffer = new byte[8192]
        def input = new FileInputStream(file)
@@ -140,9 +181,10 @@ def downloadBootstrap(String arch, String expectedChecksum, String version) {
        }
        def checksum = new BigInteger(1, digest.digest()).toString(16)
        if (checksum == expectedChecksum) {
+            if (isPackagesInApk) expandBootstrap(file, expectedChecksum, arch)
            return
        } else {
-            logger.quiet("Deleting old local file with wrong hash: " + localUrl)
+            logger.quiet("Deleting old local file with wrong hash: " + file)
            file.delete()
        }
    }
@@ -164,6 +206,7 @@ def downloadBootstrap(String arch, String expectedChecksum, String version) {
        file.delete()
        throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
    }
+    if (isPackagesInApk) expandBootstrap(file, expectedChecksum, arch)
 }

 clean {
@@ -175,17 +218,18 @@ clean {
 }

 task downloadBootstraps() {
+    boolean isPackagesInApk = getGradle().getStartParameter().getTaskRequests().toString().contains("Updated");
    doLast {
-        def version = "2021.12.02-r1"
-        downloadBootstrap("aarch64", "69fcd0e30703d9612956cece26f24458aef4f479f00a775237ecaf65eb8ca5e6", version)
-        downloadBootstrap("arm",     "db7f46e8af32b60d585865592f59c0043ba3cf445c7a6bf67a08255ab4219526", version)
-        downloadBootstrap("i686",    "1c60ce2c68e2a47328686e492b8bc0b3a2a0e0536c6f2894cb4c48ecf1fd3e9e", version)
-        downloadBootstrap("x86_64",  "1d80e2613fd35b14d5a0fb8da5b41b38208a1a40fb727bbdb9a8996793bd973e", version)
+        def version = "2021.04.13-r1"
+        downloadBootstrap("aarch64", "ff82e5755d947cd1f3e0b30916d125c6ddd8ba3254801ca7499d73653417e158", version, isPackagesInApk)
+        downloadBootstrap("arm",     "53a7df2d6d0a36a8c9ab5259c8b5457c93b8bae8aec2321a470236b6da54e59a", version, isPackagesInApk)
+        downloadBootstrap("i686",    "f0e1399a13ebed6c5229fde161f9848d9f5eeae7b8cd82f31250a813b52e371", version, isPackagesInApk)
+        downloadBootstrap("x86_64",  "e36c4d8c933dc12b3f48937b7747c7a4dcfaa70f0dd89ad5e8b4465930075ae9", version, isPackagesInApk)
    }
 }

 afterEvaluate {
-    android.applicationVariants.all { variant ->
-        variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
-    }
+  android.applicationVariants.all { variant ->
+    variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
+  }
 }
@@ -10,8 +10,3 @@
 -dontobfuscate
 #-renamesourcefileattribute SourceFile
 #-keepattributes SourceFile,LineNumberTable
-
-# Temp fix for androidx.window:window:1.0.0-alpha09 imported by termux-shared
-# https://issuetracker.google.com/issues/189001730
-# https://android-review.googlesource.com/c/platform/frameworks/support/+/1757630
-keep class androidx.window.** { *; }
@@ -32,7 +32,6 @@
    <uses-permission android:name="android.permission.DUMP" />
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" tools:ignore="ProtectedPermissions" />

    <application
        android:name=".app.TermuxApplication"
@@ -45,6 +44,14 @@
        android:supportsRtl="false"
        android:theme="@style/Theme.Termux">

+        <!--
+         This (or rather, value 2.1 or higher) is needed to make the Samsung Galaxy S8
+             mark the app with "This app is optimized to run in full screen."
+        -->
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="10.0" />
+
        <activity
            android:name=".app.TermuxActivity"
            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
@@ -95,7 +102,7 @@
            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />

        <activity
-            android:name=".shared.activities.ReportActivity"
+            android:name=".app.activities.ReportActivity"
            android:theme="@style/Theme.AppCompat.TermuxReportActivity"
            android:documentLaunchMode="intoExisting"
            />
@@ -136,7 +143,6 @@
            </intent-filter>
        </activity>

-
        <provider
            android:name=".filepicker.TermuxDocumentsProvider"
            android:authorities="${TERMUX_PACKAGE_NAME}.documents"
@@ -148,23 +154,9 @@
            </intent-filter>
        </provider>

-        <provider
-            android:name=".app.TermuxOpenReceiver$ContentProvider"
-            android:authorities="${TERMUX_PACKAGE_NAME}.files"
-            android:exported="true"
-            android:grantUriPermissions="true"
-            android:permission="${TERMUX_PACKAGE_NAME}.permission.RUN_COMMAND" />
-
-
-        <receiver android:name=".app.TermuxOpenReceiver" android:exported="false" />
-
-        <receiver android:name=".shared.activities.ReportActivity$ReportActivityBroadcastReceiver" android:exported="false" />
-
-
        <service
            android:name=".app.TermuxService"
            android:exported="false" />
-
        <service
            android:name=".app.RunCommandService"
            android:exported="true"
@@ -174,19 +166,21 @@
            </intent-filter>
        </service>

+        <receiver android:name=".app.TermuxOpenReceiver" />
+
+        <provider
+            android:name=".app.TermuxOpenReceiver$ContentProvider"
+            android:authorities="${TERMUX_PACKAGE_NAME}.files"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:readPermission="android.permission.permRead" />

-        <!-- This (or rather, value 2.1 or higher) is needed to make the Samsung Galaxy S8 mark the
-        app with "This app is optimized to run in full screen." -->
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="10.0" />
        <meta-data
            android:name="com.sec.android.support.multiwindow"
            android:value="true" />
        <meta-data
            android:name="com.samsung.android.multidisplay.keep_process_alive"
            android:value="true" />
-
    </application>

 </manifest>
@@ -10,12 +10,6 @@ import android.os.Build;
 import android.os.IBinder;

 import com.termux.R;
-import com.termux.shared.data.DataUtils;
-import com.termux.shared.data.IntentUtils;
-import com.termux.shared.file.TermuxFileUtils;
-import com.termux.shared.file.filesystem.FileType;
-import com.termux.shared.models.errors.Errno;
-import com.termux.shared.models.errors.Error;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
@@ -23,6 +17,7 @@ import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.app.utils.PluginUtils;
+import com.termux.shared.data.DataUtils;
 import com.termux.shared.models.ExecutionCommand;

 /**
@@ -65,68 +60,40 @@ public class RunCommandService extends Service {
        ExecutionCommand executionCommand = new ExecutionCommand();
        executionCommand.pluginAPIHelp = this.getString(R.string.error_run_command_service_api_help, RUN_COMMAND_SERVICE.RUN_COMMAND_API_HELP_URL);

-        Error error;
        String errmsg;

        // If invalid action passed, then just return
        if (!RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND.equals(intent.getAction())) {
            errmsg = this.getString(R.string.error_run_command_service_invalid_intent_action, intent.getAction());
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return stopService();
+            return Service.START_NOT_STICKY;
        }

-        String executableExtra = executionCommand.executable = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH, null);
-        executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS, null);
-
-        /*
-        * If intent was sent with `am` command, then normal comma characters may have been replaced
-        * with alternate characters if a normal comma existed in an argument itself to prevent it
-        * splitting into multiple arguments by `am` command.
-        * If `tudo` or `sudo` are used, then simply using their `-r` and `--comma-alternative` command
-        * options can be used without passing the below extras, but native supports is helpful if
-        * they are not being used.
-        * https://github.com/agnostic-apollo/tudo#passing-arguments-using-run_command-intent
-        * https://android.googlesource.com/platform/frameworks/base/+/21bdaf1/cmds/am/src/com/android/commands/am/Am.java#572
-        */
-        boolean replaceCommaAlternativeCharsInArguments = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS, false);
-        if (replaceCommaAlternativeCharsInArguments) {
-            String commaAlternativeCharsInArguments = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS, null);
-            if (commaAlternativeCharsInArguments == null)
-                commaAlternativeCharsInArguments = TermuxConstants.COMMA_ALTERNATIVE;
-            // Replace any commaAlternativeCharsInArguments characters with normal commas
-            DataUtils.replaceSubStringsInStringArrayItems(executionCommand.arguments, commaAlternativeCharsInArguments, TermuxConstants.COMMA_NORMAL);
-        }
-
-        executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_STDIN, null);
-        executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_WORKDIR, null);
+        executionCommand.executable = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
+        executionCommand.arguments = intent.getStringArrayExtra(RUN_COMMAND_SERVICE.EXTRA_ARGUMENTS);
+        executionCommand.stdin = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_STDIN);
+        executionCommand.workingDirectory = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_WORKDIR);
        executionCommand.inBackground = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_BACKGROUND, false);
-        executionCommand.backgroundCustomLogLevel = IntentUtils.getIntegerExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL, null);
        executionCommand.sessionAction = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_SESSION_ACTION);
-        executionCommand.commandLabel = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMAND_LABEL, "RUN_COMMAND Execution Intent Command");
-        executionCommand.commandDescription = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMAND_DESCRIPTION, null);
-        executionCommand.commandHelp = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_COMMAND_HELP, null);
+        executionCommand.commandLabel = DataUtils.getDefaultIfNull(intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_LABEL), "RUN_COMMAND Execution Intent Command");
+        executionCommand.commandDescription = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_DESCRIPTION);
+        executionCommand.commandHelp = intent.getStringExtra(RUN_COMMAND_SERVICE.EXTRA_COMMAND_HELP);
        executionCommand.isPluginExecutionCommand = true;
-        executionCommand.resultConfig.resultPendingIntent = intent.getParcelableExtra(RUN_COMMAND_SERVICE.EXTRA_PENDING_INTENT);
-        executionCommand.resultConfig.resultDirectoryPath = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_RESULT_DIRECTORY, null);
-        if (executionCommand.resultConfig.resultDirectoryPath != null) {
-            executionCommand.resultConfig.resultSingleFile = intent.getBooleanExtra(RUN_COMMAND_SERVICE.EXTRA_RESULT_SINGLE_FILE, false);
-            executionCommand.resultConfig.resultFileBasename = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_RESULT_FILE_BASENAME, null);
-            executionCommand.resultConfig.resultFileOutputFormat = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_RESULT_FILE_OUTPUT_FORMAT, null);
-            executionCommand.resultConfig.resultFileErrorFormat = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_RESULT_FILE_ERROR_FORMAT, null);
-            executionCommand.resultConfig.resultFilesSuffix = IntentUtils.getStringExtraIfSet(intent, RUN_COMMAND_SERVICE.EXTRA_RESULT_FILES_SUFFIX, null);
-        }
+        executionCommand.pluginPendingIntent = intent.getParcelableExtra(RUN_COMMAND_SERVICE.EXTRA_PENDING_INTENT);
+
+

        // If "allow-external-apps" property to not set to "true", then just return
        // We enable force notifications if "allow-external-apps" policy is violated so that the
        // user knows someone tried to run a command in termux context, since it may be malicious
        // app or imported (tasker) plugin project and not the user himself. If a pending intent is
        // also sent, then its creator is also logged and shown.
-        errmsg = PluginUtils.checkIfAllowExternalAppsPolicyIsViolated(this, LOG_TAG);
+        errmsg = PluginUtils.checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(this);
        if (errmsg != null) {
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, true);
-            return stopService();
+            return Service.START_NOT_STICKY;
        }


@@ -134,23 +101,24 @@ public class RunCommandService extends Service {
        // If executable is null or empty, then exit here instead of getting canonical path which would expand to "/"
        if (executionCommand.executable == null || executionCommand.executable.isEmpty()) {
            errmsg  = this.getString(R.string.error_run_command_service_mandatory_extra_missing, RUN_COMMAND_SERVICE.EXTRA_COMMAND_PATH);
-            executionCommand.setStateFailed(Errno.ERRNO_FAILED.getCode(), errmsg);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return stopService();
+            return Service.START_NOT_STICKY;
        }

        // Get canonical path of executable
-        executionCommand.executable = TermuxFileUtils.getCanonicalPath(executionCommand.executable, null, true);
+        executionCommand.executable = FileUtils.getCanonicalPath(executionCommand.executable, null, true);

        // If executable is not a regular file, or is not readable or executable, then just return
        // Setting of missing read and execute permissions is not done
-        error = FileUtils.validateRegularFileExistenceAndPermissions("executable", executionCommand.executable, null,
-            FileUtils.APP_EXECUTABLE_FILE_PERMISSIONS, true, true,
+        errmsg = FileUtils.validateRegularFileExistenceAndPermissions(this, "executable", executionCommand.executable, null,
+            PluginUtils.PLUGIN_EXECUTABLE_FILE_PERMISSIONS, true, true,
            false);
-        if (error != null) {
-            executionCommand.setStateFailed(error);
+        if (errmsg != null) {
+            errmsg  += "\n" + this.getString(R.string.msg_executable_absolute_path, executionCommand.executable);
+            executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
            PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            return stopService();
+            return Service.START_NOT_STICKY;
        }


@@ -158,36 +126,29 @@ public class RunCommandService extends Service {
        // If workingDirectory is not null or empty
        if (executionCommand.workingDirectory != null && !executionCommand.workingDirectory.isEmpty()) {
            // Get canonical path of workingDirectory
-            executionCommand.workingDirectory = TermuxFileUtils.getCanonicalPath(executionCommand.workingDirectory, null, true);
+            executionCommand.workingDirectory = FileUtils.getCanonicalPath(executionCommand.workingDirectory, null, true);

            // If workingDirectory is not a directory, or is not readable or writable, then just return
            // Creation of missing directory and setting of read, write and execute permissions are only done if workingDirectory is
-            // under allowed termux working directory paths.
+            // under {@link TermuxConstants#TERMUX_FILES_DIR_PATH}
            // We try to set execute permissions, but ignore if they are missing, since only read and write permissions are required
            // for working directories.
-            error = TermuxFileUtils.validateDirectoryFileExistenceAndPermissions("working", executionCommand.workingDirectory,
-                true, true, true,
-                false, true);
-            if (error != null) {
-                executionCommand.setStateFailed(error);
+            errmsg = FileUtils.validateDirectoryFileExistenceAndPermissions(this, "working", executionCommand.workingDirectory, TermuxConstants.TERMUX_FILES_DIR_PATH, true,
+                PluginUtils.PLUGIN_WORKING_DIRECTORY_PERMISSIONS, true, true,
+                true, true);
+            if (errmsg != null) {
+                errmsg  += "\n" + this.getString(R.string.msg_working_directory_absolute_path, executionCommand.workingDirectory);
+                executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_FAILED, errmsg, null);
                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-                return stopService();
+                return Service.START_NOT_STICKY;
            }
        }

-        // If the executable passed as the extra was an applet for coreutils/busybox, then we must
-        // use it instead of the canonical path above since otherwise arguments would be passed to
-        // coreutils/busybox instead and command would fail. Broken symlinks would already have been
-        // validated so it should be fine to use it.
-        executableExtra = TermuxFileUtils.getExpandedTermuxPath(executableExtra);
-        if (FileUtils.getFileType(executableExtra, false) == FileType.SYMLINK) {
-            Logger.logVerbose(LOG_TAG, "The executableExtra path \"" + executableExtra + "\" is a symlink so using it instead of the canonical path \"" + executionCommand.executable + "\"");
-            executionCommand.executable = executableExtra;
-        }

-        executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(executionCommand.executable).build();

-        Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
+        executionCommand.executableUri = new Uri.Builder().scheme(TERMUX_SERVICE.URI_SCHEME_SERVICE_EXECUTE).path(FileUtils.getExpandedTermuxPath(executionCommand.executable)).build();
+
+        Logger.logVerbose(LOG_TAG, executionCommand.toString());

        // Create execution intent with the action TERMUX_SERVICE#ACTION_SERVICE_EXECUTE to be sent to the TERMUX_SERVICE
        Intent execIntent = new Intent(TERMUX_SERVICE.ACTION_SERVICE_EXECUTE, executionCommand.executableUri);
@@ -196,21 +157,12 @@ public class RunCommandService extends Service {
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_STDIN, executionCommand.stdin);
        if (executionCommand.workingDirectory != null && !executionCommand.workingDirectory.isEmpty()) execIntent.putExtra(TERMUX_SERVICE.EXTRA_WORKDIR, executionCommand.workingDirectory);
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND, executionCommand.inBackground);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL, DataUtils.getStringFromInteger(executionCommand.backgroundCustomLogLevel, null));
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION, executionCommand.sessionAction);
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_COMMAND_LABEL, executionCommand.commandLabel);
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_COMMAND_DESCRIPTION, executionCommand.commandDescription);
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_COMMAND_HELP, executionCommand.commandHelp);
        execIntent.putExtra(TERMUX_SERVICE.EXTRA_PLUGIN_API_HELP, executionCommand.pluginAPIHelp);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT, executionCommand.resultConfig.resultPendingIntent);
-        execIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_DIRECTORY, executionCommand.resultConfig.resultDirectoryPath);
-        if (executionCommand.resultConfig.resultDirectoryPath != null) {
-            execIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_SINGLE_FILE, executionCommand.resultConfig.resultSingleFile);
-            execIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_FILE_BASENAME, executionCommand.resultConfig.resultFileBasename);
-            execIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_FILE_OUTPUT_FORMAT, executionCommand.resultConfig.resultFileOutputFormat);
-            execIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_FILE_ERROR_FORMAT, executionCommand.resultConfig.resultFileErrorFormat);
-            execIntent.putExtra(TERMUX_SERVICE.EXTRA_RESULT_FILES_SUFFIX, executionCommand.resultConfig.resultFilesSuffix);
-        }
+        execIntent.putExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT, executionCommand.pluginPendingIntent);

        // Start TERMUX_SERVICE and pass it execution intent
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -219,11 +171,8 @@ public class RunCommandService extends Service {
            this.startService(execIntent);
        }

-        return stopService();
-    }
-
-    private int stopService() {
        runStopForeground();
+
        return Service.START_NOT_STICKY;
    }

@@ -245,7 +194,7 @@ public class RunCommandService extends Service {
        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
            TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_LOW,
            TermuxConstants.TERMUX_RUN_COMMAND_NOTIFICATION_CHANNEL_NAME, null, null,
-            null, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
+            null, NotificationUtils.NOTIFICATION_MODE_SILENT);
        if (builder == null)  return null;

        // No need to show a timestamp:
@@ -12,7 +12,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -27,15 +26,10 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.autofill.AutofillManager;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 import android.widget.Toast;

 import com.termux.R;
-import com.termux.app.terminal.TermuxActivityRootView;
-import com.termux.shared.activities.ReportActivity;
-import com.termux.shared.packages.PermissionUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.app.activities.HelpActivity;
@@ -45,12 +39,11 @@ import com.termux.app.terminal.TermuxSessionsListViewController;
 import com.termux.app.terminal.io.TerminalToolbarViewPager;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.terminal.TermuxTerminalViewClient;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.app.settings.properties.TermuxAppSharedProperties;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.interact.DialogUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxUtils;
-import com.termux.shared.view.ViewUtils;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 import com.termux.app.utils.CrashUtils;
@@ -75,6 +68,7 @@ import androidx.viewpager.widget.ViewPager;
 */
 public final class TermuxActivity extends Activity implements ServiceConnection {

+
    /**
     * The connection to the {@link TermuxService}. Requested in {@link #onCreate(Bundle)} with a call to
     * {@link #bindService(Intent, ServiceConnection, int)}, and obtained and stored in
@@ -83,7 +77,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
    TermuxService mTermuxService;

    /**
-     * The {@link TerminalView} shown in  {@link TermuxActivity} that displays the terminal.
+     * The main view of the activity showing the terminal. Initialized in onCreate().
     */
    TerminalView mTerminalView;

@@ -109,16 +103,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     */
    private TermuxAppSharedProperties mProperties;

-    /**
-     * The root view of the {@link TermuxActivity}.
-     */
-    TermuxActivityRootView mTermuxActivityRootView;
-
-    /**
-     * The space at the bottom of {@link @mTermuxActivityRootView} of the {@link TermuxActivity}.
-     */
-    View mTermuxActivityBottomSpaceView;
-
    /**
     * The terminal extra keys view.
     */
@@ -145,21 +129,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     */
    private boolean mIsVisible;

-    /**
-     * If onResume() was called after onCreate().
-     */
-    private boolean isOnResumeAfterOnCreate = false;
-
-    /**
-     * The {@link TermuxActivity} is in an invalid state and must not be run.
-     */
-    private boolean mIsInvalidState;
-
    private int mNavBarHeight;

    private int mTerminalToolbarDefaultHeight;

-
    private static final int CONTEXT_MENU_SELECT_URL_ID = 0;
    private static final int CONTEXT_MENU_SHARE_TRANSCRIPT_ID = 1;
    private static final int CONTEXT_MENU_AUTOFILL_ID = 2;
@@ -171,6 +144,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
    private static final int CONTEXT_MENU_SETTINGS_ID = 8;
    private static final int CONTEXT_MENU_REPORT_ID = 9;

+    private static final int REQUESTCODE_PERMISSION_STORAGE = 1234;
+
    private static final String ARG_TERMINAL_TOOLBAR_TEXT_INPUT = "terminal_toolbar_text_input";

    private static final String LOG_TAG = "TermuxActivity";
@@ -179,16 +154,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection
    public void onCreate(Bundle savedInstanceState) {

        Logger.logDebug(LOG_TAG, "onCreate");
-        isOnResumeAfterOnCreate = true;

        // Check if a crash happened on last run of the app and show a
        // notification with the crash details if it did
-        CrashUtils.notifyAppCrashOnLastRun(this, LOG_TAG);
+        CrashUtils.notifyCrash(this, LOG_TAG);

-        // Delete ReportInfo serialized object files from cache older than 14 days
-        ReportActivity.deleteReportInfoFilesOlderThanXDays(this, 14, false);
-
-        // Load termux shared properties
+        // Load termux shared preferences and properties
+        mPreferences = new TermuxAppSharedPreferences(this);
        mProperties = new TermuxAppSharedProperties(this);

        setActivityTheme();
@@ -197,22 +169,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection

        setContentView(R.layout.activity_termux);

-        // Load termux shared preferences
-        // This will also fail if TermuxConstants.TERMUX_PACKAGE_NAME does not equal applicationId
-        mPreferences = TermuxAppSharedPreferences.build(this, true);
-        if (mPreferences == null) {
-            // An AlertDialog should have shown to kill the app, so we don't continue running activity code
-            mIsInvalidState = true;
-            return;
-        }
-
-        setMargins();
-
-        mTermuxActivityRootView = findViewById(R.id.activity_termux_root_view);
-        mTermuxActivityRootView.setActivity(this);
-        mTermuxActivityBottomSpaceView = findViewById(R.id.activity_termux_bottom_space_view);
-        mTermuxActivityRootView.setOnApplyWindowInsetsListener(new TermuxActivityRootView.WindowInsetsListener());
-
        View content = findViewById(android.R.id.content);
        content.setOnApplyWindowInsetsListener((v, insets) -> {
            mNavBarHeight = insets.getSystemWindowInsetBottom();
@@ -229,8 +185,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection

        setTerminalToolbarView(savedInstanceState);

-        setSettingsButtonView();
-
        setNewSessionButtonView();

        setToggleKeyboardView();
@@ -257,92 +211,34 @@ public final class TermuxActivity extends Activity implements ServiceConnection

        Logger.logDebug(LOG_TAG, "onStart");

-        if (mIsInvalidState) return;
-
        mIsVisible = true;

-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onStart();
-
-        if (mTermuxTerminalViewClient != null)
-            mTermuxTerminalViewClient.onStart();
-
-        if (mPreferences.isTerminalMarginAdjustmentEnabled())
-            addTermuxActivityRootViewGlobalLayoutListener();
+        if (mTermuxService != null) {
+            // The service has connected, but data may have changed since we were last in the foreground.
+            // Get the session stored in shared preferences stored by {@link #onStop} if its valid,
+            // otherwise get the last session currently running.
+            mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
+            termuxSessionListNotifyUpdated();
+        }

        registerTermuxActivityBroadcastReceiver();
+
+        // If user changed the preference from {@link TermuxSettings} activity and returns, then
+        // update the {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value.
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
+
+        // The current terminal session may have changed while being away, force
+        // a refresh of the displayed terminal.
+        mTerminalView.onScreenUpdated();
    }

    @Override
    public void onResume() {
        super.onResume();

-        Logger.logVerbose(LOG_TAG, "onResume");
-
-        if (mIsInvalidState) return;
-
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onResume();
-
-        if (mTermuxTerminalViewClient != null)
-            mTermuxTerminalViewClient.onResume();
-
-        isOnResumeAfterOnCreate = false;
+        mTermuxTerminalViewClient.setSoftKeyboardState(true, false);
    }

-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        Logger.logDebug(LOG_TAG, "onStop");
-
-        if (mIsInvalidState) return;
-
-        mIsVisible = false;
-
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onStop();
-
-        if (mTermuxTerminalViewClient != null)
-            mTermuxTerminalViewClient.onStop();
-
-        removeTermuxActivityRootViewGlobalLayoutListener();
-
-        unregisterTermuxActivityBroadcastReceiever();
-        getDrawer().closeDrawers();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        Logger.logDebug(LOG_TAG, "onDestroy");
-
-        if (mIsInvalidState) return;
-
-        if (mTermuxService != null) {
-            // Do not leave service and session clients with references to activity.
-            mTermuxService.unsetTermuxTerminalSessionClient();
-            mTermuxService = null;
-        }
-
-        try {
-            unbindService(this);
-        } catch (Exception e) {
-            // ignore.
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onSaveInstanceState(savedInstanceState);
-        saveTerminalToolbarTextInput(savedInstanceState);
-    }
-
-
-
-
-
    /**
     * Part of the {@link ServiceConnection} interface. The service is bound with
     * {@link #bindService(Intent, ServiceConnection, int)} in {@link #onCreate(Bundle)} which will cause a call to this
@@ -365,7 +261,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                        Bundle bundle = getIntent().getExtras();
                        boolean launchFailsafe = false;
                        if (bundle != null) {
-                            launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
+                            launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                        }
                        mTermuxTerminalSessionClient.addNewSession(launchFailsafe, null);
                    } catch (WindowManager.BadTokenException e) {
@@ -380,7 +276,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
            Intent i = getIntent();
            if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
                // Android 7.1 app shortcut from res/xml/shortcuts.xml.
-                boolean isFailSafe = i.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
+                boolean isFailSafe = i.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
                mTermuxTerminalSessionClient.addNewSession(isFailSafe, null);
            } else {
                mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast());
@@ -400,7 +296,41 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        finishActivityIfNotFinishing();
    }

+    @Override
+    protected void onStop() {
+        super.onStop();

+        Logger.logDebug(LOG_TAG, "onStop");
+
+        mIsVisible = false;
+
+        // Store current session in shared preferences so that it can be restored later in
+        // {@link #onStart} if needed.
+        mTermuxTerminalSessionClient.setCurrentStoredSession();
+
+        unregisterTermuxActivityBroadcastReceiever();
+        getDrawer().closeDrawers();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        Logger.logDebug(LOG_TAG, "onDestroy");
+
+        if (mTermuxService != null) {
+            // Do not leave service and session clients with references to activity.
+            mTermuxService.unsetTermuxTerminalSessionClient();
+            mTermuxService = null;
+        }
+        unbindService(this);
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        saveTerminalToolbarTextInput(savedInstanceState);
+    }



@@ -416,59 +346,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        if (mProperties.isUsingBlackUI()) {
            findViewById(R.id.left_drawer).setBackgroundColor(ContextCompat.getColor(this,
                android.R.color.background_dark));
-            ((ImageButton) findViewById(R.id.settings_button)).setColorFilter(Color.WHITE);
        }
    }

-    private void setMargins() {
-        RelativeLayout relativeLayout = findViewById(R.id.activity_termux_root_relative_layout);
-        int marginHorizontal = mProperties.getTerminalMarginHorizontal();
-        int marginVertical = mProperties.getTerminalMarginVertical();
-        ViewUtils.setLayoutMarginsInDp(relativeLayout, marginHorizontal, marginVertical, marginHorizontal, marginVertical);
-    }
-
-
-
-    public void addTermuxActivityRootViewGlobalLayoutListener() {
-        getTermuxActivityRootView().getViewTreeObserver().addOnGlobalLayoutListener(getTermuxActivityRootView());
-    }
-
-    public void removeTermuxActivityRootViewGlobalLayoutListener() {
-        if (getTermuxActivityRootView() != null)
-            getTermuxActivityRootView().getViewTreeObserver().removeOnGlobalLayoutListener(getTermuxActivityRootView());
-    }
-
-
-
-    private void setTermuxTerminalViewAndClients() {
-        // Set termux terminal view and session clients
-        mTermuxTerminalSessionClient = new TermuxTerminalSessionClient(this);
-        mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionClient);
-
-        // Set termux terminal view
-        mTerminalView = findViewById(R.id.terminal_view);
-        mTerminalView.setTerminalViewClient(mTermuxTerminalViewClient);
-
-        if (mTermuxTerminalViewClient != null)
-            mTermuxTerminalViewClient.onCreate();
-
-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onCreate();
-    }
-
-    private void setTermuxSessionsListView() {
-        ListView termuxSessionsListView = findViewById(R.id.terminal_sessions_list);
-        mTermuxSessionListViewController = new TermuxSessionsListViewController(this, mTermuxService.getTermuxSessions());
-        termuxSessionsListView.setAdapter(mTermuxSessionListViewController);
-        termuxSessionsListView.setOnItemClickListener(mTermuxSessionListViewController);
-        termuxSessionsListView.setOnItemLongClickListener(mTermuxSessionListViewController);
-    }
-


    private void setTerminalToolbarView(Bundle savedInstanceState) {
-        final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
-        if (mPreferences.shouldShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);
+        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
+        if (mPreferences.getShowTerminalToolbar()) terminalToolbarViewPager.setVisibility(View.VISIBLE);

        ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
        mTerminalToolbarDefaultHeight = layoutParams.height;
@@ -484,24 +369,23 @@ public final class TermuxActivity extends Activity implements ServiceConnection
    }

    private void setTerminalToolbarHeight() {
-        final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
+        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
        if (terminalToolbarViewPager == null) return;
-
        ViewGroup.LayoutParams layoutParams = terminalToolbarViewPager.getLayoutParams();
        layoutParams.height = (int) Math.round(mTerminalToolbarDefaultHeight *
-            (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length) *
-            mProperties.getTerminalToolbarHeightScaleFactor());
+                                                (mProperties.getExtraKeysInfo() == null ? 0 : mProperties.getExtraKeysInfo().getMatrix().length) *
+                                                    mProperties.getTerminalToolbarHeightScaleFactor());
        terminalToolbarViewPager.setLayoutParams(layoutParams);
    }

    public void toggleTerminalToolbar() {
-        final ViewPager terminalToolbarViewPager = getTerminalToolbarViewPager();
+        final ViewPager terminalToolbarViewPager = findViewById(R.id.terminal_toolbar_view_pager);
        if (terminalToolbarViewPager == null) return;

        final boolean showNow = mPreferences.toogleShowTerminalToolbar();
        Logger.showToast(this, (showNow ? getString(R.string.msg_enabling_terminal_toolbar) : getString(R.string.msg_disabling_terminal_toolbar)), true);
        terminalToolbarViewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
-        if (showNow && isTerminalToolbarTextInputViewSelected()) {
+        if (showNow && terminalToolbarViewPager.getCurrentItem() == 1) {
            // Focus the text input view if just revealed.
            findViewById(R.id.terminal_toolbar_text_input).requestFocus();
        }
@@ -519,18 +403,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection



-    private void setSettingsButtonView() {
-        ImageButton settingsButton = findViewById(R.id.settings_button);
-        settingsButton.setOnClickListener(v -> {
-            startActivity(new Intent(this, SettingsActivity.class));
-        });
-    }
-
    private void setNewSessionButtonView() {
        View newSessionButton = findViewById(R.id.new_session_button);
        newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionClient.addNewSession(false, null));
        newSessionButton.setOnLongClickListener(v -> {
-            TextInputDialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
+            DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
                R.string.action_create_named_session_confirm, text -> mTermuxTerminalSessionClient.addNewSession(false, text),
                R.string.action_new_session_failsafe, text -> mTermuxTerminalSessionClient.addNewSession(true, text),
                -1, null, null);
@@ -554,6 +431,36 @@ public final class TermuxActivity extends Activity implements ServiceConnection



+    private void setTermuxTerminalViewAndClients() {
+        // Set termux terminal view and session clients
+        mTermuxTerminalSessionClient = new TermuxTerminalSessionClient(this);
+        mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionClient);
+
+        // Set termux terminal view
+        mTerminalView = findViewById(R.id.terminal_view);
+        mTerminalView.setTerminalViewClient(mTermuxTerminalViewClient);
+
+        mTerminalView.setTextSize(mPreferences.getFontSize());
+        mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn());
+
+        // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
+        mTerminalView.setIsTerminalViewKeyLoggingEnabled(mPreferences.getTerminalViewKeyLoggingEnabled());
+
+        mTermuxTerminalSessionClient.checkForFontAndColors();
+    }
+
+    private void setTermuxSessionsListView() {
+        ListView termuxSessionsListView = findViewById(R.id.terminal_sessions_list);
+        mTermuxSessionListViewController = new TermuxSessionsListViewController(this, mTermuxService.getTermuxSessions());
+        termuxSessionsListView.setAdapter(mTermuxSessionListViewController);
+        termuxSessionsListView.setOnItemClickListener(mTermuxSessionListViewController);
+        termuxSessionsListView.setOnItemLongClickListener(mTermuxSessionListViewController);
+    }
+
+
+
+
+
    @SuppressLint("RtlHardcoded")
    @Override
    public void onBackPressed() {
@@ -601,7 +508,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        menu.add(Menu.NONE, CONTEXT_MENU_RESET_TERMINAL_ID, Menu.NONE, R.string.action_reset_terminal);
        menu.add(Menu.NONE, CONTEXT_MENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.action_kill_process, getCurrentSession().getPid())).setEnabled(currentSession.isRunning());
        menu.add(Menu.NONE, CONTEXT_MENU_STYLING_ID, Menu.NONE, R.string.action_style_terminal);
-        menu.add(Menu.NONE, CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.action_toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.shouldKeepScreenOn());
+        menu.add(Menu.NONE, CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.action_toggle_keep_screen_on).setCheckable(true).setChecked(mPreferences.getKeepScreenOn());
        menu.add(Menu.NONE, CONTEXT_MENU_HELP_ID, Menu.NONE, R.string.action_open_help);
        menu.add(Menu.NONE, CONTEXT_MENU_SETTINGS_ID, Menu.NONE, R.string.action_open_settings);
        menu.add(Menu.NONE, CONTEXT_MENU_REPORT_ID, Menu.NONE, R.string.action_report_issue);
@@ -629,7 +536,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                requestAutoFill();
                return true;
            case CONTEXT_MENU_RESET_TERMINAL_ID:
-                onResetTerminalSession(session);
+                resetSession(session);
                return true;
            case CONTEXT_MENU_KILL_PROCESS_ID:
                showKillSessionDialog(session);
@@ -668,13 +575,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        b.show();
    }

-    private void onResetTerminalSession(TerminalSession session) {
+    private void resetSession(TerminalSession session) {
        if (session != null) {
            session.reset();
            showToast(getResources().getString(R.string.msg_terminal_reset), true);
-
-            if (mTermuxTerminalSessionClient != null)
-                mTermuxTerminalSessionClient.onResetTerminalSession();
        }
    }

@@ -715,22 +619,22 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     * For processes to access shared internal storage (/sdcard) we need this permission.
     */
    public boolean ensureStoragePermissionGranted() {
-        if (PermissionUtils.checkPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
            return true;
        } else {
-            Logger.logInfo(LOG_TAG, "Storage permission not granted, requesting permission.");
-            PermissionUtils.requestPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE, PermissionUtils.REQUEST_GRANT_STORAGE_PERMISSION);
+            Logger.logDebug(LOG_TAG, "Storage permission not granted, requesting permission.");
+            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
            return false;
        }
    }

    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == PermissionUtils.REQUEST_GRANT_STORAGE_PERMISSION && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            Logger.logInfo(LOG_TAG, "Storage permission granted by user on request.");
+        if (requestCode == REQUESTCODE_PERMISSION_STORAGE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            Logger.logDebug(LOG_TAG, "Storage permission granted by user on request.");
            TermuxInstaller.setupStorageSymlinks(this);
        } else {
-            Logger.logInfo(LOG_TAG, "Storage permission denied by user on request.");
+            Logger.logDebug(LOG_TAG, "Storage permission denied by user on request.");
        }
    }

@@ -740,14 +644,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        return mNavBarHeight;
    }

-    public TermuxActivityRootView getTermuxActivityRootView() {
-        return mTermuxActivityRootView;
-    }
-
-    public View getTermuxActivityBottomSpaceView() {
-        return mTermuxActivityBottomSpaceView;
-    }
-
    public ExtraKeysView getExtraKeysView() {
        return mExtraKeysView;
    }
@@ -760,20 +656,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        return (DrawerLayout) findViewById(R.id.drawer_layout);
    }

-
-    public ViewPager getTerminalToolbarViewPager() {
-        return (ViewPager) findViewById(R.id.terminal_toolbar_view_pager);
-    }
-
-    public boolean isTerminalViewSelected() {
-        return getTerminalToolbarViewPager().getCurrentItem() == 0;
-    }
-
-    public boolean isTerminalToolbarTextInputViewSelected() {
-        return getTerminalToolbarViewPager().getCurrentItem() == 1;
-    }
-
-
    public void termuxSessionListNotifyUpdated() {
        mTermuxSessionListViewController.notifyDataSetChanged();
    }
@@ -782,10 +664,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        return mIsVisible;
    }

-    public boolean isOnResumeAfterOnCreate() {
-        return isOnResumeAfterOnCreate;
-    }
-


    public TermuxService getTermuxService() {
@@ -867,7 +745,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                        return;
                    case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
                        Logger.logDebug(LOG_TAG, "Received intent to reload styling");
-                        reloadActivityStyling();
+                        reloadTermuxActivityStyling();
                        return;
                    default:
                }
@@ -875,27 +753,22 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        }
    }

-    private void reloadActivityStyling() {
+    private void reloadTermuxActivityStyling() {
+        if (mTermuxTerminalSessionClient != null) {
+            mTermuxTerminalSessionClient.checkForFontAndColors();
+        }
+
        if (mProperties!= null) {
            mProperties.loadTermuxPropertiesFromDisk();

            if (mExtraKeysView != null) {
-                mExtraKeysView.setButtonTextAllCaps(mProperties.shouldExtraKeysTextBeAllCaps());
                mExtraKeysView.reload(mProperties.getExtraKeysInfo());
            }
        }

-        setMargins();
        setTerminalToolbarHeight();

-        if (mTermuxTerminalSessionClient != null)
-            mTermuxTerminalSessionClient.onReload();
-
-        if (mTermuxTerminalViewClient != null)
-            mTermuxTerminalViewClient.onReload();
-
-        if (mTermuxService != null)
-            mTermuxService.setTerminalTranscriptRows();
+        mTermuxTerminalViewClient.setSoftKeyboardState(false, true);

        // To change the activity and drawer theme, activity needs to be recreated.
        // But this will destroy the activity, and will call the onCreate() again.
@@ -2,7 +2,7 @@ package com.termux.app;

 import android.app.Application;

-import com.termux.shared.crash.TermuxCrashUtils;
+import com.termux.shared.crash.CrashHandler;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.logger.Logger;

@@ -12,7 +12,7 @@ public class TermuxApplication extends Application {
        super.onCreate();

        // Set crash handler for the app
-        TermuxCrashUtils.setCrashHandler(this);
+        CrashHandler.setCrashHandler(this);

        // Set log level for the app
        setLogLevel();
@@ -20,8 +20,7 @@ public class TermuxApplication extends Application {

    private void setLogLevel() {
        // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(getApplicationContext());
-        if (preferences == null) return;
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(getApplicationContext());
        preferences.setLogLevel(null, preferences.getLogLevel());
        Logger.logDebug("Starting Application");
    }
@@ -5,21 +5,15 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Environment;
+import android.os.UserManager;
 import android.system.Os;
 import android.util.Pair;
 import android.view.WindowManager;

 import com.termux.R;
-import com.termux.app.utils.CrashUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.file.TermuxFileUtils;
-import com.termux.shared.interact.MessageDialogUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.models.errors.Error;
-import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.termux.TermuxUtils;

 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -31,11 +25,6 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

-import static com.termux.shared.termux.TermuxConstants.TERMUX_PREFIX_DIR;
-import static com.termux.shared.termux.TermuxConstants.TERMUX_PREFIX_DIR_PATH;
-import static com.termux.shared.termux.TermuxConstants.TERMUX_STAGING_PREFIX_DIR;
-import static com.termux.shared.termux.TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH;
-
 /**
 * Install the Termux bootstrap packages if necessary by following the below steps:
 * <p/>
@@ -61,49 +50,33 @@ final class TermuxInstaller {

    /** Performs bootstrap setup if necessary. */
    static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenDone) {
-        String bootstrapErrorMessage;
-        Error filesDirectoryAccessibleError;
-
-        // This will also call Context.getFilesDir(), which should ensure that termux files directory
-        // is created if it does not already exist
-        filesDirectoryAccessibleError = TermuxFileUtils.isTermuxFilesDirectoryAccessible(activity, true, true);
-        boolean isFilesDirectoryAccessible = filesDirectoryAccessibleError == null;
-
        // Termux can only be run as the primary user (device owner) since only that
        // account has the expected file system paths. Verify that:
-        if (!PackageUtils.isCurrentUserThePrimaryUser(activity)) {
-            bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, MarkdownUtils.getMarkdownCodeForString(TERMUX_PREFIX_DIR_PATH, false));
-            Logger.logError(LOG_TAG, "isFilesDirectoryAccessible: " + isFilesDirectoryAccessible);
+        UserManager um = (UserManager) activity.getSystemService(Context.USER_SERVICE);
+        boolean isPrimaryUser = um.getSerialNumberForUser(android.os.Process.myUserHandle()) == 0;
+        if (!isPrimaryUser) {
+            String bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
            Logger.logError(LOG_TAG, bootstrapErrorMessage);
-            sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
-            MessageDialogUtils.exitAppWithErrorMessage(activity,
-                activity.getString(R.string.bootstrap_error_title),
-                bootstrapErrorMessage);
+            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(bootstrapErrorMessage)
+                .setOnDismissListener(dialog -> System.exit(0)).setPositiveButton(android.R.string.ok, null).show();
            return;
        }

-        if (!isFilesDirectoryAccessible) {
-            bootstrapErrorMessage = Error.getMinimalErrorString(filesDirectoryAccessibleError) + "\nTERMUX_FILES_DIR: " + MarkdownUtils.getMarkdownCodeForString(TermuxConstants.TERMUX_FILES_DIR_PATH, false);
-            Logger.logError(LOG_TAG, bootstrapErrorMessage);
-            sendBootstrapCrashReportNotification(activity, bootstrapErrorMessage);
-            MessageDialogUtils.showMessage(activity,
-                activity.getString(R.string.bootstrap_error_title),
-                bootstrapErrorMessage, null);
-            return;
-        }
+        final String PREFIX_FILE_PATH = TermuxConstants.TERMUX_PREFIX_DIR_PATH;
+        final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;

        // If prefix directory exists, even if its a symlink to a valid directory and symlink is not broken/dangling
-        if (FileUtils.directoryFileExists(TERMUX_PREFIX_DIR_PATH, true)) {
-            File[] PREFIX_FILE_LIST =  TERMUX_PREFIX_DIR.listFiles();
+        if (FileUtils.directoryFileExists(PREFIX_FILE_PATH, true)) {
+             File[] PREFIX_FILE_LIST =  PREFIX_FILE.listFiles();
            // If prefix directory is empty or only contains the tmp directory
-            if(PREFIX_FILE_LIST == null || PREFIX_FILE_LIST.length == 0 || (PREFIX_FILE_LIST.length == 1 && TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH.equals(PREFIX_FILE_LIST[0].getAbsolutePath()))) {
-                Logger.logInfo(LOG_TAG, "The termux prefix directory \"" + TERMUX_PREFIX_DIR_PATH + "\" exists but is empty or only contains the tmp directory.");
-            } else {
-                whenDone.run();
-                return;
-            }
-        } else if (FileUtils.fileExists(TERMUX_PREFIX_DIR_PATH, false)) {
-            Logger.logInfo(LOG_TAG, "The termux prefix directory \"" + TERMUX_PREFIX_DIR_PATH + "\" does not exist but another file exists at its destination.");
+             if(PREFIX_FILE_LIST == null || PREFIX_FILE_LIST.length == 0 || (PREFIX_FILE_LIST.length == 1 && TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH.equals(PREFIX_FILE_LIST[0].getAbsolutePath()))) {
+                 Logger.logInfo(LOG_TAG, "The prefix directory \"" + PREFIX_FILE_PATH + "\" exists but is empty or only contains the tmp directory.");
+             } else {
+                 whenDone.run();
+                 return;
+             }
+        } else if (FileUtils.fileExists(PREFIX_FILE_PATH, false)) {
+            Logger.logInfo(LOG_TAG, "The prefix directory \"" + PREFIX_FILE_PATH + "\" does not exist but another file exists at its destination.");
        }

        final ProgressDialog progress = ProgressDialog.show(activity, null, activity.getString(R.string.bootstrap_installer_body), true, false);
@@ -113,37 +86,24 @@ final class TermuxInstaller {
                try {
                    Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");

-                    Error error;
+                    String errmsg;
+
+                    final String STAGING_PREFIX_PATH = TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH;
+                    final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);

                    // Delete prefix staging directory or any file at its destination
-                    error = FileUtils.deleteFile("termux prefix staging directory", TERMUX_STAGING_PREFIX_DIR_PATH, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
+                    errmsg = FileUtils.deleteFile(activity, "prefix staging directory", STAGING_PREFIX_PATH, true);
+                    if (errmsg != null) {
+                        throw new RuntimeException(errmsg);
                    }

                    // Delete prefix directory or any file at its destination
-                    error = FileUtils.deleteFile("termux prefix directory", TERMUX_PREFIX_DIR_PATH, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
+                    errmsg = FileUtils.deleteFile(activity, "prefix directory", PREFIX_FILE_PATH, true);
+                    if (errmsg != null) {
+                        throw new RuntimeException(errmsg);
                    }

-                    // Create prefix staging directory if it does not already exist and set required permissions
-                    error = TermuxFileUtils.isTermuxPrefixStagingDirectoryAccessible(true, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
-                    }
-
-                    // Create prefix directory if it does not already exist and set required permissions
-                    error = TermuxFileUtils.isTermuxPrefixDirectoryAccessible(true, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
-                    }
-
-                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
+                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + STAGING_PREFIX_PATH + "\".");

                    final byte[] buffer = new byte[8096];
                    final List<Pair<String, String>> symlinks = new ArrayList<>(50);
@@ -160,25 +120,17 @@ final class TermuxInstaller {
                                    if (parts.length != 2)
                                        throw new RuntimeException("Malformed symlink line: " + line);
                                    String oldPath = parts[0];
-                                    String newPath = TERMUX_STAGING_PREFIX_DIR_PATH + "/" + parts[1];
+                                    String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
                                    symlinks.add(Pair.create(oldPath, newPath));

-                                    error = ensureDirectoryExists(new File(newPath).getParentFile());
-                                    if (error != null) {
-                                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                                        return;
-                                    }
+                                    ensureDirectoryExists(activity, new File(newPath).getParentFile());
                                }
                            } else {
                                String zipEntryName = zipEntry.getName();
-                                File targetFile = new File(TERMUX_STAGING_PREFIX_DIR_PATH, zipEntryName);
+                                File targetFile = new File(STAGING_PREFIX_PATH, zipEntryName);
                                boolean isDirectory = zipEntry.isDirectory();

-                                error = ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
-                                if (error != null) {
-                                    showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                                    return;
-                                }
+                                ensureDirectoryExists(activity, isDirectory ? targetFile : targetFile.getParentFile());

                                if (!isDirectory) {
                                    try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
@@ -186,8 +138,7 @@ final class TermuxInstaller {
                                        while ((readBytes = zipInput.read(buffer)) != -1)
                                            outStream.write(buffer, 0, readBytes);
                                    }
-                                    if (zipEntryName.startsWith("bin/") || zipEntryName.startsWith("libexec") ||
-                                        zipEntryName.startsWith("lib/apt/apt-helper") || zipEntryName.startsWith("lib/apt/methods")) {
+                                    if (zipEntryName.startsWith("bin/") || zipEntryName.startsWith("libexec") || zipEntryName.startsWith("lib/apt/methods")) {
                                        //noinspection OctalInteger
                                        Os.chmod(targetFile.getAbsolutePath(), 0700);
                                    }
@@ -202,18 +153,30 @@ final class TermuxInstaller {
                        Os.symlink(symlink.first, symlink.second);
                    }

-                    Logger.logInfo(LOG_TAG, "Moving termux prefix staging to prefix directory.");
+                    Logger.logInfo(LOG_TAG, "Moving prefix staging to prefix directory.");

-                    if (!TERMUX_STAGING_PREFIX_DIR.renameTo(TERMUX_PREFIX_DIR)) {
-                        throw new RuntimeException("Moving termux prefix staging to prefix directory failed");
+                    if (!STAGING_PREFIX_FILE.renameTo(PREFIX_FILE)) {
+                        throw new RuntimeException("Moving prefix staging to prefix directory failed");
                    }

                    Logger.logInfo(LOG_TAG, "Bootstrap packages installed successfully.");
                    activity.runOnUiThread(whenDone);
-
                } catch (final Exception e) {
-                    showBootstrapErrorDialog(activity, whenDone, Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)));
-
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Bootstrap error", e);
+                    activity.runOnUiThread(() -> {
+                        try {
+                            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_body)
+                                .setNegativeButton(R.string.bootstrap_error_abort, (dialog, which) -> {
+                                    dialog.dismiss();
+                                    activity.finish();
+                                }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
+                                dialog.dismiss();
+                                TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
+                            }).show();
+                        } catch (WindowManager.BadTokenException e1) {
+                            // Activity already dismissed - ignore.
+                        }
+                    });
                } finally {
                    activity.runOnUiThread(() -> {
                        try {
@@ -227,37 +190,6 @@ final class TermuxInstaller {
        }.start();
    }

-    public static void showBootstrapErrorDialog(Activity activity, Runnable whenDone, String message) {
-        Logger.logErrorExtended(LOG_TAG, "Bootstrap Error:\n" + message);
-
-        // Send a notification with the exception so that the user knows why bootstrap setup failed
-        sendBootstrapCrashReportNotification(activity, message);
-
-        activity.runOnUiThread(() -> {
-            try {
-                new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_body)
-                    .setNegativeButton(R.string.bootstrap_error_abort, (dialog, which) -> {
-                        dialog.dismiss();
-                        activity.finish();
-                    })
-                    .setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
-                        dialog.dismiss();
-                        FileUtils.deleteFile("termux prefix directory", TERMUX_PREFIX_DIR_PATH, true);
-                        TermuxInstaller.setupBootstrapIfNeeded(activity, whenDone);
-                    }).show();
-            } catch (WindowManager.BadTokenException e1) {
-                // Activity already dismissed - ignore.
-            }
-        });
-    }
-
-    private static void sendBootstrapCrashReportNotification(Activity activity, String message) {
-        CrashUtils.sendCrashReportNotification(activity, LOG_TAG,
-            "## Bootstrap Error\n\n" + message + "\n\n" +
-                TermuxUtils.getTermuxDebugMarkdownString(activity),
-            true, true);
-    }
-
    static void setupStorageSymlinks(final Context context) {
        final String LOG_TAG = "termux-storage";

@@ -266,14 +198,12 @@ final class TermuxInstaller {
        new Thread() {
            public void run() {
                try {
-                    Error error;
+                    String errmsg;
                    File storageDir = TermuxConstants.TERMUX_STORAGE_HOME_DIR;

-                    error = FileUtils.clearDirectory("~/storage", storageDir.getAbsolutePath());
-                    if (error != null) {
-                        Logger.logErrorAndShowToast(context, LOG_TAG, error.getMessage());
-                        Logger.logErrorExtended(LOG_TAG, "Setup Storage Error\n" + error.toString());
-                        CrashUtils.sendCrashReportNotification(context, LOG_TAG, "## Setup Storage Error\n\n" + Error.getErrorMarkdownString(error), true, true);
+                    errmsg = FileUtils.clearDirectory(context, "~/storage", storageDir.getAbsolutePath());
+                    if (errmsg != null) {
+                        Logger.logErrorAndShowToast(context, LOG_TAG, errmsg);
                        return;
                    }

@@ -310,16 +240,19 @@ final class TermuxInstaller {

                    Logger.logInfo(LOG_TAG, "Storage symlinks created successfully.");
                } catch (Exception e) {
-                    Logger.logErrorAndShowToast(context, LOG_TAG, e.getMessage());
-                    Logger.logStackTraceWithMessage(LOG_TAG, "Setup Storage Error: Error setting up link", e);
-                    CrashUtils.sendCrashReportNotification(context, LOG_TAG, "## Setup Storage Error\n\n" + Logger.getStackTracesMarkdownString(null, Logger.getStackTracesStringArray(e)), true, true);
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Error setting up link", e);
                }
            }
        }.start();
    }

-    private static Error ensureDirectoryExists(File directory) {
-        return FileUtils.createDirectoryFile(directory.getAbsolutePath());
+    public static void ensureDirectoryExists(Context context, File directory) {
+        String errmsg;
+
+        errmsg = FileUtils.createDirectoryFile(context, directory.getAbsolutePath());
+        if (errmsg != null) {
+            throw new RuntimeException(errmsg);
+        }
    }

    public static byte[] loadZipBytes() {
@@ -13,8 +13,6 @@ import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 import android.webkit.MimeTypeMap;

-import com.termux.app.utils.PluginUtils;
-import com.termux.shared.data.IntentUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;

@@ -36,8 +34,6 @@ public class TermuxOpenReceiver extends BroadcastReceiver {
            return;
        }

-        Logger.logVerbose(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
-
        final String filePath = data.getPath();
        final String contentTypeExtra = intent.getStringExtra("content-type");
        final boolean useChooser = intent.getBooleanExtra("chooser", false);
@@ -115,8 +111,6 @@ public class TermuxOpenReceiver extends BroadcastReceiver {

    public static class ContentProvider extends android.content.ContentProvider {

-        private static final String LOG_TAG = "TermuxContentProvider";
-
        @Override
        public boolean onCreate() {
            return true;
@@ -184,33 +178,15 @@ public class TermuxOpenReceiver extends BroadcastReceiver {
            File file = new File(uri.getPath());
            try {
                String path = file.getCanonicalPath();
-                Logger.logDebug(LOG_TAG, "Open file request received for \"" + path + "\" with mode \"" + mode + "\"");
                String storagePath = Environment.getExternalStorageDirectory().getCanonicalPath();
                // See https://support.google.com/faqs/answer/7496913:
                if (!(path.startsWith(TermuxConstants.TERMUX_FILES_DIR_PATH) || path.startsWith(storagePath))) {
                    throw new IllegalArgumentException("Invalid path: " + path);
                }
-
-                // If "allow-external-apps" property to not set to "true", then throw exception
-                String errmsg = PluginUtils.checkIfAllowExternalAppsPolicyIsViolated(getContext(), LOG_TAG);
-                if (errmsg != null) {
-                    throw new IllegalArgumentException(errmsg);
-                }
-
-                // Do not allow apps with RUN_COMMAND permission to modify termux apps properties files,
-                // including allow-external-apps
-                if (TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH.equals(path) ||
-                    TermuxConstants.TERMUX_PROPERTIES_SECONDARY_FILE_PATH.equals(path) ||
-                    TermuxConstants.TERMUX_FLOAT_PROPERTIES_PRIMARY_FILE_PATH.equals(path) ||
-                    TermuxConstants.TERMUX_FLOAT_PROPERTIES_SECONDARY_FILE_PATH.equals(path)) {
-                    mode = "r";
-                }
-
            } catch (IOException e) {
                throw new IllegalArgumentException(e);
            }
-
-            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.parseMode(mode));
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
        }
    }

@@ -6,6 +6,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -19,17 +20,9 @@ import android.os.PowerManager;
 import android.provider.Settings;
 import android.widget.ArrayAdapter;

-import androidx.annotation.Nullable;
-
 import com.termux.R;
-import com.termux.app.settings.properties.TermuxAppSharedProperties;
 import com.termux.app.terminal.TermuxTerminalSessionClient;
 import com.termux.app.utils.PluginUtils;
-import com.termux.shared.data.IntentUtils;
-import com.termux.shared.models.errors.Errno;
-import com.termux.shared.shell.ShellUtils;
-import com.termux.shared.shell.TermuxShellEnvironmentClient;
-import com.termux.shared.shell.TermuxShellUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
@@ -39,6 +32,7 @@ import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.packages.PermissionUtils;
+import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.shared.shell.TermuxTask;
@@ -49,6 +43,8 @@ import com.termux.terminal.TerminalSessionClient;
 import java.util.ArrayList;
 import java.util.List;

+import javax.annotation.Nullable;
+
 /**
 * A service holding a list of {@link TermuxSession} in {@link #mTermuxSessions} and background {@link TermuxTask}
 * in {@link #mTermuxTasks}, showing a foreground notification while running so that it is not terminated.
@@ -111,14 +107,18 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
    /** If the user has executed the {@link TERMUX_SERVICE#ACTION_STOP_SERVICE} intent. */
    boolean mWantsToStop = false;

-    public Integer mTerminalTranscriptRows;
-
    private static final String LOG_TAG = "TermuxService";

    @Override
    public void onCreate() {
        Logger.logVerbose(LOG_TAG, "onCreate");
        runStartForeground();
+
+        if (getApplicationContext().getApplicationInfo().targetSdkVersion >= 30) {
+            Intent intent = new Intent();
+            intent.setComponent(new ComponentName("com.termux","com.termux.app.TermuxPackageInstallerService"));
+            startService(intent);
+        }
    }

    @SuppressLint("Wakelock")
@@ -164,7 +164,7 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
    public void onDestroy() {
        Logger.logVerbose(LOG_TAG, "onDestroy");

-        TermuxShellUtils.clearTermuxTMPDIR(true);
+        ShellUtils.clearTermuxTMPDIR(this, true);

        actionReleaseWakeLock(false);
        if (!mWantsToStop)
@@ -258,22 +258,22 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
        List<TermuxSession> termuxSessions = new ArrayList<>(mTermuxSessions);
        for (int i = 0; i < termuxSessions.size(); i++) {
            ExecutionCommand executionCommand = termuxSessions.get(i).getExecutionCommand();
-            processResult = mWantsToStop || executionCommand.isPluginExecutionCommandWithPendingResult();
+            processResult = mWantsToStop || (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null);
            termuxSessions.get(i).killIfExecuting(this, processResult);
        }

        List<TermuxTask> termuxTasks = new ArrayList<>(mTermuxTasks);
        for (int i = 0; i < termuxTasks.size(); i++) {
            ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
-            if (executionCommand.isPluginExecutionCommandWithPendingResult())
+            if (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null)
                termuxTasks.get(i).killIfExecuting(this, true);
        }

        List<ExecutionCommand> pendingPluginExecutionCommands = new ArrayList<>(mPendingPluginExecutionCommands);
        for (int i = 0; i < pendingPluginExecutionCommands.size(); i++) {
            ExecutionCommand executionCommand = pendingPluginExecutionCommands.get(i);
-            if (!executionCommand.shouldNotProcessResults() && executionCommand.isPluginExecutionCommandWithPendingResult()) {
-                if (executionCommand.setStateFailed(Errno.ERRNO_CANCELLED.getCode(), this.getString(com.termux.shared.R.string.error_execution_cancelled))) {
+            if (!executionCommand.shouldNotProcessResults() && executionCommand.pluginPendingIntent != null) {
+                if (executionCommand.setStateFailed(ExecutionCommand.RESULT_CODE_CANCELED, this.getString(com.termux.shared.R.string.error_execution_cancelled), null)) {
                    PluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
                }
            }
@@ -361,29 +361,20 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas

        if (executionCommand.executableUri != null) {
            executionCommand.executable = executionCommand.executableUri.getPath();
-            executionCommand.arguments = IntentUtils.getStringArrayExtraIfSet(intent, TERMUX_SERVICE.EXTRA_ARGUMENTS, null);
+            executionCommand.arguments = intent.getStringArrayExtra(TERMUX_SERVICE.EXTRA_ARGUMENTS);
            if (executionCommand.inBackground)
-                executionCommand.stdin = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_STDIN, null);
-                executionCommand.backgroundCustomLogLevel = IntentUtils.getIntegerExtraIfSet(intent, TERMUX_SERVICE.EXTRA_BACKGROUND_CUSTOM_LOG_LEVEL, null);
+                executionCommand.stdin = intent.getStringExtra(TERMUX_SERVICE.EXTRA_STDIN);
        }

-        executionCommand.workingDirectory = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_WORKDIR, null);
-        executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, false);
+        executionCommand.workingDirectory = intent.getStringExtra(TERMUX_SERVICE.EXTRA_WORKDIR);
+        executionCommand.isFailsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
        executionCommand.sessionAction = intent.getStringExtra(TERMUX_SERVICE.EXTRA_SESSION_ACTION);
-        executionCommand.commandLabel = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_COMMAND_LABEL, "Execution Intent Command");
-        executionCommand.commandDescription = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_COMMAND_DESCRIPTION, null);
-        executionCommand.commandHelp = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_COMMAND_HELP, null);
-        executionCommand.pluginAPIHelp = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_PLUGIN_API_HELP, null);
+        executionCommand.commandLabel = DataUtils.getDefaultIfNull(intent.getStringExtra(TERMUX_SERVICE.EXTRA_COMMAND_LABEL), "Execution Intent Command");
+        executionCommand.commandDescription = intent.getStringExtra(TERMUX_SERVICE.EXTRA_COMMAND_DESCRIPTION);
+        executionCommand.commandHelp = intent.getStringExtra(TERMUX_SERVICE.EXTRA_COMMAND_HELP);
+        executionCommand.pluginAPIHelp = intent.getStringExtra(TERMUX_SERVICE.EXTRA_PLUGIN_API_HELP);
        executionCommand.isPluginExecutionCommand = true;
-        executionCommand.resultConfig.resultPendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);
-        executionCommand.resultConfig.resultDirectoryPath = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RESULT_DIRECTORY, null);
-        if (executionCommand.resultConfig.resultDirectoryPath != null) {
-            executionCommand.resultConfig.resultSingleFile = intent.getBooleanExtra(TERMUX_SERVICE.EXTRA_RESULT_SINGLE_FILE, false);
-            executionCommand.resultConfig.resultFileBasename = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RESULT_FILE_BASENAME, null);
-            executionCommand.resultConfig.resultFileOutputFormat = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RESULT_FILE_OUTPUT_FORMAT, null);
-            executionCommand.resultConfig.resultFileErrorFormat = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RESULT_FILE_ERROR_FORMAT, null);
-            executionCommand.resultConfig.resultFilesSuffix = IntentUtils.getStringExtraIfSet(intent, TERMUX_SERVICE.EXTRA_RESULT_FILES_SUFFIX, null);
-        }
+        executionCommand.pluginPendingIntent = intent.getParcelableExtra(TERMUX_SERVICE.EXTRA_PENDING_INTENT);

        // Add the execution command to pending plugin execution commands list
        mPendingPluginExecutionCommands.add(executionCommand);
@@ -427,16 +418,11 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
        }

        if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
-            Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
+            Logger.logVerbose(LOG_TAG, executionCommand.toString());

-        TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, new TermuxShellEnvironmentClient(), false);
+        TermuxTask newTermuxTask = TermuxTask.execute(this, executionCommand, this, false);
        if (newTermuxTask == null) {
            Logger.logError(LOG_TAG, "Failed to execute new TermuxTask command for:\n" + executionCommand.getCommandIdAndLabelLogString());
-            // If the execution command was started for a plugin, then process the error
-            if (executionCommand.isPluginExecutionCommand)
-                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            else
-                Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
            return null;
        }

@@ -519,20 +505,14 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
        }

        if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
-            Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
+            Logger.logVerbose(LOG_TAG, executionCommand.toString());

        // If the execution command was started for a plugin, only then will the stdout be set
        // Otherwise if command was manually started by the user like by adding a new terminal session,
        // then no need to set stdout
-        executionCommand.terminalTranscriptRows = getTerminalTranscriptRows();
-        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, new TermuxShellEnvironmentClient(), sessionName, executionCommand.isPluginExecutionCommand);
+        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, sessionName, executionCommand.isPluginExecutionCommand);
        if (newTermuxSession == null) {
            Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString());
-            // If the execution command was started for a plugin, then process the error
-            if (executionCommand.isPluginExecutionCommand)
-                PluginUtils.processPluginExecutionCommandError(this, LOG_TAG, executionCommand, false);
-            else
-                Logger.logErrorExtended(LOG_TAG, executionCommand.toString());
            return null;
        }

@@ -587,19 +567,6 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
        updateNotification();
    }

-    /** Get the terminal transcript rows to be used for new {@link TermuxSession}. */
-    public Integer getTerminalTranscriptRows() {
-        if (mTerminalTranscriptRows == null)
-            setTerminalTranscriptRows();
-        return mTerminalTranscriptRows;
-    }
-
-    public void setTerminalTranscriptRows() {
-        // TermuxService only uses this termux property currently, so no need to load them all into
-        // an internal values map like TermuxActivity does
-        mTerminalTranscriptRows = TermuxAppSharedProperties.getTerminalTranscriptRows(this);
-    }
-



@@ -641,13 +608,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
        // For android >= 10, apps require Display over other apps permission to start foreground activities
        // from background (services). If it is not granted, then TermuxSessions that are started will
        // show in Termux notification but will not run until user manually clicks the notification.
-        if (PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this, true)) {
+        if (PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this)) {
            TermuxActivity.startTermuxActivity(this);
-        } else {
-            TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
-            if (preferences == null) return;
-            if (preferences.arePluginErrorNotificationsEnabled())
-                Logger.showToast(this, this.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
        }
    }

@@ -708,7 +670,7 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas

        // Set pending intent to be launched when notification is clicked
        Intent notificationIntent = TermuxActivity.newInstance(this);
-        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);


        // Set notification text
@@ -732,8 +694,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
        // Build the notification
        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
            TermuxConstants.TERMUX_APP_NOTIFICATION_CHANNEL_ID, priority,
-            TermuxConstants.TERMUX_APP_NAME, notificationText, null,
-            contentIntent, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
+            getText(R.string.application_name), notificationText, null,
+            pendingIntent, NotificationUtils.NOTIFICATION_MODE_SILENT);
        if (builder == null)  return null;

        // No need to show a timestamp:
@@ -788,9 +750,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas

    private void setCurrentStoredTerminalSession(TerminalSession session) {
        if (session == null) return;
-        // Make the newly created session the current one to be displayed
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
-        if (preferences == null) return;
+        // Make the newly created session the current one to be displayed:
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(this);
        preferences.setCurrentSession(session.mHandle);
    }

@@ -12,8 +12,6 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;

-import com.termux.shared.termux.TermuxConstants;
-
 /** Basic embedded browser for viewing help pages. */
 public final class HelpActivity extends Activity {

@@ -41,7 +39,7 @@ public final class HelpActivity extends Activity {
        mWebView.setWebViewClient(new WebViewClient() {
            @Override
            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.equals(TermuxConstants.TERMUX_WIKI_URL) || url.startsWith(TermuxConstants.TERMUX_WIKI_URL + "/")) {
+                if (url.startsWith("https://wiki.termux.com")) {
                    // Inline help.
                    setContentView(progressLayout);
                    return false;
@@ -62,7 +60,7 @@ public final class HelpActivity extends Activity {
                setContentView(mWebView);
            }
        });
-        mWebView.loadUrl(TermuxConstants.TERMUX_WIKI_URL);
+        mWebView.loadUrl("https://wiki.termux.com/wiki/Main_Page");
    }

    @Override
@@ -0,0 +1,180 @@
+package com.termux.app.activities;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.termux.R;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.markdown.MarkdownUtils;
+import com.termux.shared.interact.ShareUtils;
+import com.termux.app.models.ReportInfo;
+
+import org.commonmark.node.FencedCodeBlock;
+
+import io.noties.markwon.Markwon;
+import io.noties.markwon.recycler.MarkwonAdapter;
+import io.noties.markwon.recycler.SimpleEntry;
+
+public class ReportActivity extends AppCompatActivity {
+
+    private static final String EXTRA_REPORT_INFO = "report_info";
+
+    ReportInfo mReportInfo;
+    String mReportMarkdownString;
+    String mReportActivityMarkdownString;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_report);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
+        }
+
+        Bundle bundle = null;
+        Intent intent = getIntent();
+        if (intent != null)
+            bundle = intent.getExtras();
+        else if (savedInstanceState != null)
+            bundle = savedInstanceState;
+
+        updateUI(bundle);
+
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+
+        if (intent != null)
+            updateUI(intent.getExtras());
+    }
+
+    private void updateUI(Bundle bundle) {
+
+        if (bundle == null) {
+            finish();
+            return;
+        }
+
+        mReportInfo = (ReportInfo) bundle.getSerializable(EXTRA_REPORT_INFO);
+
+        if (mReportInfo == null) {
+            finish();
+            return;
+        }
+
+
+        final ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            if (mReportInfo.reportTitle != null)
+                actionBar.setTitle(mReportInfo.reportTitle);
+            else
+                actionBar.setTitle(TermuxConstants.TERMUX_APP_NAME + " App Report");
+        }
+
+
+        RecyclerView recyclerView = findViewById(R.id.recycler_view);
+
+        final Markwon markwon = MarkdownUtils.getRecyclerMarkwonBuilder(this);
+
+        final MarkwonAdapter adapter = MarkwonAdapter.builderTextViewIsRoot(R.layout.activity_report_adapter_node_default)
+            .include(FencedCodeBlock.class, SimpleEntry.create(R.layout.activity_report_adapter_node_code_block, R.id.code_text_view))
+            .build();
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        recyclerView.setAdapter(adapter);
+
+
+        generateReportActivityMarkdownString();
+        adapter.setMarkdown(markwon, mReportActivityMarkdownString);
+        adapter.notifyDataSetChanged();
+    }
+
+
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putSerializable(EXTRA_REPORT_INFO, mReportInfo);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        final MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_report, menu);
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Remove activity from recents menu on back button press
+        finishAndRemoveTask();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.menu_item_share_report) {
+            if (mReportMarkdownString != null)
+                ShareUtils.shareText(this, getString(R.string.title_report_text), mReportMarkdownString);
+        } else if (id == R.id.menu_item_copy_report) {
+            if (mReportMarkdownString != null)
+                ShareUtils.copyTextToClipboard(this, mReportMarkdownString, null);
+        }
+
+        return false;
+    }
+
+    /**
+     * Generate the markdown {@link String} to be shown in {@link ReportActivity}.
+     */
+    private void generateReportActivityMarkdownString() {
+        mReportMarkdownString = ReportInfo.getReportInfoMarkdownString(mReportInfo);
+
+        mReportActivityMarkdownString = "";
+        if (mReportInfo.reportStringPrefix != null)
+            mReportActivityMarkdownString += mReportInfo.reportStringPrefix;
+
+        mReportActivityMarkdownString += mReportMarkdownString;
+
+        if (mReportInfo.reportStringSuffix != null)
+            mReportActivityMarkdownString += mReportInfo.reportStringSuffix;
+    }
+
+
+
+    public static void startReportActivity(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
+        context.startActivity(newInstance(context, reportInfo));
+    }
+
+    public static Intent newInstance(@NonNull final Context context, @NonNull final ReportInfo reportInfo) {
+        Intent intent = new Intent(context, ReportActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(EXTRA_REPORT_INFO, reportInfo);
+        intent.putExtras(bundle);
+
+        // Note that ReportActivity task has documentLaunchMode="intoExisting" set in AndroidManifest.xml
+        // which has equivalent behaviour to the following. The following dynamic way doesn't seem to
+        // work for notification pending intent, i.e separate task isn't created and activity is
+        // launched in the same task as TermuxActivity.
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |  Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        return intent;
+    }
+
+}
@@ -1,29 +1,12 @@
 package com.termux.app.activities;

-import android.content.Context;
 import android.os.Bundle;
-import android.os.Environment;

-import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;

 import com.termux.R;
-import com.termux.shared.activities.ReportActivity;
-import com.termux.shared.file.FileUtils;
-import com.termux.shared.models.ReportInfo;
-import com.termux.app.models.UserAction;
-import com.termux.shared.interact.ShareUtils;
-import com.termux.shared.packages.PackageUtils;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
-import com.termux.shared.termux.AndroidUtils;
-import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.termux.TermuxUtils;

 public class SettingsActivity extends AppCompatActivity {

@@ -53,111 +36,7 @@ public class SettingsActivity extends AppCompatActivity {
    public static class RootPreferencesFragment extends PreferenceFragmentCompat {
        @Override
        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            Context context = getContext();
-            if (context == null) return;
-
            setPreferencesFromResource(R.xml.root_preferences, rootKey);
-
-            configureTermuxAPIPreference(context);
-            configureTermuxFloatPreference(context);
-            configureTermuxTaskerPreference(context);
-            configureTermuxWidgetPreference(context);
-            configureAboutPreference(context);
-            configureDonatePreference(context);
-        }
-
-        private void configureTermuxAPIPreference(@NonNull Context context) {
-            Preference termuxAPIPreference = findPreference("termux_api");
-            if (termuxAPIPreference != null) {
-                TermuxAPIAppSharedPreferences preferences = TermuxAPIAppSharedPreferences.build(context, false);
-                // If failed to get app preferences, then likely app is not installed, so do not show its preference
-                termuxAPIPreference.setVisible(preferences != null);
-            }
-        }
-
-        private void configureTermuxFloatPreference(@NonNull Context context) {
-            Preference termuxFloatPreference = findPreference("termux_float");
-            if (termuxFloatPreference != null) {
-                TermuxFloatAppSharedPreferences preferences = TermuxFloatAppSharedPreferences.build(context, false);
-                // If failed to get app preferences, then likely app is not installed, so do not show its preference
-                termuxFloatPreference.setVisible(preferences != null);
-            }
-        }
-
-        private void configureTermuxTaskerPreference(@NonNull Context context) {
-            Preference termuxTaskerPreference = findPreference("termux_tasker");
-            if (termuxTaskerPreference != null) {
-                TermuxTaskerAppSharedPreferences preferences = TermuxTaskerAppSharedPreferences.build(context, false);
-                // If failed to get app preferences, then likely app is not installed, so do not show its preference
-                termuxTaskerPreference.setVisible(preferences != null);
-            }
-        }
-
-        private void configureTermuxWidgetPreference(@NonNull Context context) {
-            Preference termuxWidgetPreference = findPreference("termux_widget");
-            if (termuxWidgetPreference != null) {
-                TermuxWidgetAppSharedPreferences preferences = TermuxWidgetAppSharedPreferences.build(context, false);
-                // If failed to get app preferences, then likely app is not installed, so do not show its preference
-                termuxWidgetPreference.setVisible(preferences != null);
-            }
-        }
-
-        private void configureAboutPreference(@NonNull Context context) {
-            Preference aboutPreference = findPreference("about");
-            if (aboutPreference != null) {
-                aboutPreference.setOnPreferenceClickListener(preference -> {
-                    new Thread() {
-                        @Override
-                        public void run() {
-                            String title = "About";
-
-                            StringBuilder aboutString = new StringBuilder();
-                            aboutString.append(TermuxUtils.getAppInfoMarkdownString(context, false));
-
-                            String termuxPluginAppsInfo =  TermuxUtils.getTermuxPluginAppsInfoMarkdownString(context);
-                            if (termuxPluginAppsInfo != null)
-                                aboutString.append("\n\n").append(termuxPluginAppsInfo);
-
-                            aboutString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
-                            aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
-
-                            String userActionName = UserAction.ABOUT.getName();
-                            ReportActivity.startReportActivity(context, new ReportInfo(userActionName,
-                                TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null,
-                                aboutString.toString(), null, false,
-                                userActionName,
-                                Environment.getExternalStorageDirectory() + "/" +
-                                    FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
-                        }
-                    }.start();
-
-                    return true;
-                });
-            }
-        }
-
-        private void configureDonatePreference(@NonNull Context context) {
-            Preference donatePreference = findPreference("donate");
-            if (donatePreference != null) {
-                String signingCertificateSHA256Digest = PackageUtils.getSigningCertificateSHA256DigestForPackage(context);
-                if (signingCertificateSHA256Digest != null) {
-                    // If APK is a Google Playstore release, then do not show the donation link
-                    // since Termux isn't exempted from the playstore policy donation links restriction
-                    // Check Fund solicitations: https://pay.google.com/intl/en_in/about/policy/
-                    String apkRelease = TermuxUtils.getAPKRelease(signingCertificateSHA256Digest);
-                    if (apkRelease == null || apkRelease.equals(TermuxConstants.APK_RELEASE_GOOGLE_PLAYSTORE_SIGNING_CERTIFICATE_SHA256_DIGEST)) {
-                        donatePreference.setVisible(false);
-                        return;
-                    } else {
-                        donatePreference.setVisible(true);
-                    }
-                }
-
-                donatePreference.setOnPreferenceClickListener(preference -> {
-                    ShareUtils.openURL(context, TermuxConstants.TERMUX_DONATE_URL);
-                    return true;
-                });
-            }
        }
    }

@@ -1,10 +1,9 @@
-package com.termux.app.fragments.settings.termux;
+package com.termux.app.fragments.settings;

 import android.content.Context;
 import android.os.Bundle;

 import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceCategory;
@@ -21,32 +20,20 @@ public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {

    @Override
    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(context));
+        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(getContext()));

-        setPreferencesFromResource(R.xml.termux_debugging_preferences, rootKey);
+        setPreferencesFromResource(R.xml.debugging_preferences, rootKey);

-        configureLoggingPreferences(context);
-    }
-
-    private void configureLoggingPreferences(@NonNull Context context) {
        PreferenceCategory loggingCategory = findPreference("logging");
-        if (loggingCategory == null) return;

-        ListPreference logLevelListPreference = findPreference("log_level");
-        if (logLevelListPreference != null) {
-            TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context, true);
-            if (preferences == null) return;
-
-            setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel());
+        if (loggingCategory != null) {
+            final ListPreference logLevelListPreference = setLogLevelListPreferenceData(findPreference("log_level"), getActivity());
            loggingCategory.addPreference(logLevelListPreference);
        }
    }

-    public static ListPreference setLogLevelListPreferenceData(ListPreference logLevelListPreference, Context context, int logLevel) {
+    protected ListPreference setLogLevelListPreferenceData(ListPreference logLevelListPreference, Context context) {
        if (logLevelListPreference == null)
            logLevelListPreference = new ListPreference(context);

@@ -56,8 +43,8 @@ public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
        logLevelListPreference.setEntryValues(logLevels);
        logLevelListPreference.setEntries(logLevelLabels);

-        logLevelListPreference.setValue(String.valueOf(logLevel));
-        logLevelListPreference.setDefaultValue(Logger.DEFAULT_LOG_LEVEL);
+        logLevelListPreference.setValue(String.valueOf(Logger.getLogLevel()));
+        logLevelListPreference.setDefaultValue(Logger.getLogLevel());

        return logLevelListPreference;
    }
@@ -73,12 +60,12 @@ class DebuggingPreferencesDataStore extends PreferenceDataStore {

    private DebuggingPreferencesDataStore(Context context) {
        mContext = context;
-        mPreferences = TermuxAppSharedPreferences.build(context, true);
+        mPreferences = new TermuxAppSharedPreferences(context);
    }

    public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
        if (mInstance == null) {
-            mInstance = new DebuggingPreferencesDataStore(context);
+            mInstance = new DebuggingPreferencesDataStore(context.getApplicationContext());
        }
        return mInstance;
    }
@@ -88,7 +75,6 @@ class DebuggingPreferencesDataStore extends PreferenceDataStore {
    @Override
    @Nullable
    public String getString(String key, @Nullable String defValue) {
-        if (mPreferences == null) return null;
        if (key == null) return null;

        switch (key) {
@@ -101,7 +87,6 @@ class DebuggingPreferencesDataStore extends PreferenceDataStore {

    @Override
    public void putString(String key, @Nullable String value) {
-        if (mPreferences == null) return;
        if (key == null) return;

        switch (key) {
@@ -119,7 +104,6 @@ class DebuggingPreferencesDataStore extends PreferenceDataStore {

    @Override
    public void putBoolean(String key, boolean value) {
-        if (mPreferences == null) return;
        if (key == null) return;

        switch (key) {
@@ -139,14 +123,13 @@ class DebuggingPreferencesDataStore extends PreferenceDataStore {

    @Override
    public boolean getBoolean(String key, boolean defValue) {
-        if (mPreferences == null) return false;
        switch (key) {
            case "terminal_view_key_logging_enabled":
-                return mPreferences.isTerminalViewKeyLoggingEnabled();
+                return mPreferences.getTerminalViewKeyLoggingEnabled();
            case "plugin_error_notifications_enabled":
-                return mPreferences.arePluginErrorNotificationsEnabled();
+                return mPreferences.getPluginErrorNotificationsEnabled();
            case "crash_report_notifications_enabled":
-                return mPreferences.areCrashReportNotificationsEnabled();
+                return mPreferences.getCrashReportNotificationsEnabled();
            default:
                return false;
        }
@@ -1,4 +1,4 @@
-package com.termux.app.fragments.settings.termux;
+package com.termux.app.fragments.settings;

 import android.content.Context;
 import android.os.Bundle;
@@ -16,13 +16,10 @@ public class TerminalIOPreferencesFragment extends PreferenceFragmentCompat {

    @Override
    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TerminalIOPreferencesDataStore.getInstance(context));
+        preferenceManager.setPreferenceDataStore(TerminalIOPreferencesDataStore.getInstance(getContext()));

-        setPreferencesFromResource(R.xml.termux_terminal_io_preferences, rootKey);
+        setPreferencesFromResource(R.xml.terminal_io_preferences, rootKey);
    }

 }
@@ -36,12 +33,12 @@ class TerminalIOPreferencesDataStore extends PreferenceDataStore {

    private TerminalIOPreferencesDataStore(Context context) {
        mContext = context;
-        mPreferences = TermuxAppSharedPreferences.build(context, true);
+        mPreferences = new TermuxAppSharedPreferences(context);
    }

    public static synchronized TerminalIOPreferencesDataStore getInstance(Context context) {
        if (mInstance == null) {
-            mInstance = new TerminalIOPreferencesDataStore(context);
+            mInstance = new TerminalIOPreferencesDataStore(context.getApplicationContext());
        }
        return mInstance;
    }
@@ -50,16 +47,12 @@ class TerminalIOPreferencesDataStore extends PreferenceDataStore {

    @Override
    public void putBoolean(String key, boolean value) {
-        if (mPreferences == null) return;
        if (key == null) return;

        switch (key) {
            case "soft_keyboard_enabled":
                    mPreferences.setSoftKeyboardEnabled(value);
                break;
-            case "soft_keyboard_enabled_only_if_no_hardware":
-                mPreferences.setSoftKeyboardEnabledOnlyIfNoHardware(value);
-                break;
            default:
                break;
        }
@@ -67,13 +60,9 @@ class TerminalIOPreferencesDataStore extends PreferenceDataStore {

    @Override
    public boolean getBoolean(String key, boolean defValue) {
-        if (mPreferences == null) return false;
-
        switch (key) {
            case "soft_keyboard_enabled":
-                return mPreferences.isSoftKeyboardEnabled();
-            case "soft_keyboard_enabled_only_if_no_hardware":
-                return mPreferences.isSoftKeyboardEnabledOnlyIfNoHardware();
+                return mPreferences.getSoftKeyboardEnabled();
            default:
                return false;
        }
@@ -1,49 +0,0 @@
-package com.termux.app.fragments.settings;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
-
-@Keep
-public class TermuxAPIPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TermuxAPIPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_api_preferences, rootKey);
-    }
-
-}
-
-class TermuxAPIPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxAPIAppSharedPreferences mPreferences;
-
-    private static TermuxAPIPreferencesDataStore mInstance;
-
-    private TermuxAPIPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxAPIAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized TermuxAPIPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new TermuxAPIPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-}
@@ -1,49 +0,0 @@
-package com.termux.app.fragments.settings;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
-
-@Keep
-public class TermuxFloatPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TermuxFloatPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_float_preferences, rootKey);
-    }
-
-}
-
-class TermuxFloatPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxFloatAppSharedPreferences mPreferences;
-
-    private static TermuxFloatPreferencesDataStore mInstance;
-
-    private TermuxFloatPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxFloatAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized TermuxFloatPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new TermuxFloatPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-}
@@ -1,49 +0,0 @@
-package com.termux.app.fragments.settings;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-
-@Keep
-public class TermuxPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TermuxPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_preferences, rootKey);
-    }
-
-}
-
-class TermuxPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxAppSharedPreferences mPreferences;
-
-    private static TermuxPreferencesDataStore mInstance;
-
-    private TermuxPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized TermuxPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new TermuxPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-}
@@ -1,49 +0,0 @@
-package com.termux.app.fragments.settings;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
-
-@Keep
-public class TermuxTaskerPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TermuxTaskerPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_tasker_preferences, rootKey);
-    }
-
-}
-
-class TermuxTaskerPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxTaskerAppSharedPreferences mPreferences;
-
-    private static TermuxTaskerPreferencesDataStore mInstance;
-
-    private TermuxTaskerPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxTaskerAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized TermuxTaskerPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new TermuxTaskerPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-}
@@ -1,49 +0,0 @@
-package com.termux.app.fragments.settings;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
-
-@Keep
-public class TermuxWidgetPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TermuxWidgetPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_widget_preferences, rootKey);
-    }
-
-}
-
-class TermuxWidgetPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxWidgetAppSharedPreferences mPreferences;
-
-    private static TermuxWidgetPreferencesDataStore mInstance;
-
-    private TermuxWidgetPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxWidgetAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized TermuxWidgetPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new TermuxWidgetPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-}
@@ -1,77 +0,0 @@
-package com.termux.app.fragments.settings.termux;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
-
-@Keep
-public class TerminalViewPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(TerminalViewPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_terminal_view_preferences, rootKey);
-    }
-
-}
-
-class TerminalViewPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxAppSharedPreferences mPreferences;
-
-    private static TerminalViewPreferencesDataStore mInstance;
-
-    private TerminalViewPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized TerminalViewPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new TerminalViewPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-
-
-    @Override
-    public void putBoolean(String key, boolean value) {
-        if (mPreferences == null) return;
-        if (key == null) return;
-
-        switch (key) {
-            case "terminal_margin_adjustment":
-                    mPreferences.setTerminalMarginAdjustment(value);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean getBoolean(String key, boolean defValue) {
-        if (mPreferences == null) return false;
-
-        switch (key) {
-            case "terminal_margin_adjustment":
-                return mPreferences.isTerminalMarginAdjustmentEnabled();
-            default:
-                return false;
-        }
-    }
-
-}
@@ -1,101 +0,0 @@
-package com.termux.app.fragments.settings.termux_api;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxAPIAppSharedPreferences;
-
-@Keep
-public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_api_debugging_preferences, rootKey);
-
-        configureLoggingPreferences(context);
-    }
-
-    private void configureLoggingPreferences(@NonNull Context context) {
-        PreferenceCategory loggingCategory = findPreference("logging");
-        if (loggingCategory == null) return;
-
-        ListPreference logLevelListPreference = findPreference("log_level");
-        if (logLevelListPreference != null) {
-            TermuxAPIAppSharedPreferences preferences = TermuxAPIAppSharedPreferences.build(context, true);
-            if (preferences == null) return;
-
-            com.termux.app.fragments.settings.termux.DebuggingPreferencesFragment.
-                setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel(true));
-            loggingCategory.addPreference(logLevelListPreference);
-        }
-    }
-}
-
-class DebuggingPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxAPIAppSharedPreferences mPreferences;
-
-    private static DebuggingPreferencesDataStore mInstance;
-
-    private DebuggingPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxAPIAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new DebuggingPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-
-
-    @Override
-    @Nullable
-    public String getString(String key, @Nullable String defValue) {
-        if (mPreferences == null) return null;
-        if (key == null) return null;
-
-        switch (key) {
-            case "log_level":
-                return String.valueOf(mPreferences.getLogLevel(true));
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void putString(String key, @Nullable String value) {
-        if (mPreferences == null) return;
-        if (key == null) return;
-
-        switch (key) {
-            case "log_level":
-                if (value != null) {
-                    mPreferences.setLogLevel(mContext, Integer.parseInt(value), true);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-}
@@ -1,126 +0,0 @@
-package com.termux.app.fragments.settings.termux_float;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
-
-@Keep
-public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_float_debugging_preferences, rootKey);
-
-        configureLoggingPreferences(context);
-    }
-
-    private void configureLoggingPreferences(@NonNull Context context) {
-        PreferenceCategory loggingCategory = findPreference("logging");
-        if (loggingCategory == null) return;
-
-        ListPreference logLevelListPreference = findPreference("log_level");
-        if (logLevelListPreference != null) {
-            TermuxFloatAppSharedPreferences preferences = TermuxFloatAppSharedPreferences.build(context, true);
-            if (preferences == null) return;
-
-            com.termux.app.fragments.settings.termux.DebuggingPreferencesFragment.
-                setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel(true));
-            loggingCategory.addPreference(logLevelListPreference);
-        }
-    }
-}
-
-class DebuggingPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxFloatAppSharedPreferences mPreferences;
-
-    private static DebuggingPreferencesDataStore mInstance;
-
-    private DebuggingPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxFloatAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new DebuggingPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-
-
-    @Override
-    @Nullable
-    public String getString(String key, @Nullable String defValue) {
-        if (mPreferences == null) return null;
-        if (key == null) return null;
-
-        switch (key) {
-            case "log_level":
-                return String.valueOf(mPreferences.getLogLevel(true));
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void putString(String key, @Nullable String value) {
-        if (mPreferences == null) return;
-        if (key == null) return;
-
-        switch (key) {
-            case "log_level":
-                if (value != null) {
-                    mPreferences.setLogLevel(mContext, Integer.parseInt(value), true);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void putBoolean(String key, boolean value) {
-        if (mPreferences == null) return;
-        if (key == null) return;
-
-        switch (key) {
-            case "terminal_view_key_logging_enabled":
-                mPreferences.setTerminalViewKeyLoggingEnabled(value, true);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean getBoolean(String key, boolean defValue) {
-        if (mPreferences == null) return false;
-        switch (key) {
-            case "terminal_view_key_logging_enabled":
-                return mPreferences.isTerminalViewKeyLoggingEnabled(true);
-            default:
-                return false;
-        }
-    }
-
-}
@@ -1,101 +0,0 @@
-package com.termux.app.fragments.settings.termux_tasker;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxTaskerAppSharedPreferences;
-
-@Keep
-public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_tasker_debugging_preferences, rootKey);
-
-        configureLoggingPreferences(context);
-    }
-
-    private void configureLoggingPreferences(@NonNull Context context) {
-        PreferenceCategory loggingCategory = findPreference("logging");
-        if (loggingCategory == null) return;
-
-        ListPreference logLevelListPreference = findPreference("log_level");
-        if (logLevelListPreference != null) {
-            TermuxTaskerAppSharedPreferences preferences = TermuxTaskerAppSharedPreferences.build(context, true);
-            if (preferences == null) return;
-
-            com.termux.app.fragments.settings.termux.DebuggingPreferencesFragment.
-                setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel(true));
-            loggingCategory.addPreference(logLevelListPreference);
-        }
-    }
-}
-
-class DebuggingPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxTaskerAppSharedPreferences mPreferences;
-
-    private static DebuggingPreferencesDataStore mInstance;
-
-    private DebuggingPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxTaskerAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new DebuggingPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-
-
-    @Override
-    @Nullable
-    public String getString(String key, @Nullable String defValue) {
-        if (mPreferences == null) return null;
-        if (key == null) return null;
-
-        switch (key) {
-            case "log_level":
-                return String.valueOf(mPreferences.getLogLevel(true));
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void putString(String key, @Nullable String value) {
-        if (mPreferences == null) return;
-        if (key == null) return;
-
-        switch (key) {
-            case "log_level":
-                if (value != null) {
-                    mPreferences.setLogLevel(mContext, Integer.parseInt(value), true);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-}
@@ -1,101 +0,0 @@
-package com.termux.app.fragments.settings.termux_widget;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.termux.R;
-import com.termux.shared.settings.preferences.TermuxWidgetAppSharedPreferences;
-
-@Keep
-public class DebuggingPreferencesFragment extends PreferenceFragmentCompat {
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        Context context = getContext();
-        if (context == null) return;
-
-        PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setPreferenceDataStore(DebuggingPreferencesDataStore.getInstance(context));
-
-        setPreferencesFromResource(R.xml.termux_widget_debugging_preferences, rootKey);
-
-        configureLoggingPreferences(context);
-    }
-
-    private void configureLoggingPreferences(@NonNull Context context) {
-        PreferenceCategory loggingCategory = findPreference("logging");
-        if (loggingCategory == null) return;
-
-        ListPreference logLevelListPreference = findPreference("log_level");
-        if (logLevelListPreference != null) {
-            TermuxWidgetAppSharedPreferences preferences = TermuxWidgetAppSharedPreferences.build(context, true);
-            if (preferences == null) return;
-
-            com.termux.app.fragments.settings.termux.DebuggingPreferencesFragment.
-                setLogLevelListPreferenceData(logLevelListPreference, context, preferences.getLogLevel(true));
-            loggingCategory.addPreference(logLevelListPreference);
-        }
-    }
-}
-
-class DebuggingPreferencesDataStore extends PreferenceDataStore {
-
-    private final Context mContext;
-    private final TermuxWidgetAppSharedPreferences mPreferences;
-
-    private static DebuggingPreferencesDataStore mInstance;
-
-    private DebuggingPreferencesDataStore(Context context) {
-        mContext = context;
-        mPreferences = TermuxWidgetAppSharedPreferences.build(context, true);
-    }
-
-    public static synchronized DebuggingPreferencesDataStore getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new DebuggingPreferencesDataStore(context);
-        }
-        return mInstance;
-    }
-
-
-
-    @Override
-    @Nullable
-    public String getString(String key, @Nullable String defValue) {
-        if (mPreferences == null) return null;
-        if (key == null) return null;
-
-        switch (key) {
-            case "log_level":
-                return String.valueOf(mPreferences.getLogLevel(true));
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void putString(String key, @Nullable String value) {
-        if (mPreferences == null) return;
-        if (key == null) return;
-
-        switch (key) {
-            case "log_level":
-                if (value != null) {
-                    mPreferences.setLogLevel(mContext, Integer.parseInt(value), true);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-}
@@ -1,52 +1,40 @@
-package com.termux.shared.models;
+package com.termux.app.models;

 import com.termux.shared.markdown.MarkdownUtils;
-import com.termux.shared.termux.AndroidUtils;
+import com.termux.shared.termux.TermuxUtils;

 import java.io.Serializable;

-/**
- * An object that stored info for {@link com.termux.shared.activities.ReportActivity}.
- */
 public class ReportInfo implements Serializable {

    /** The user action that was being processed for which the report was generated. */
-    public final String userAction;
+    public final UserAction userAction;
    /** The internal app component that sent the report. */
    public final String sender;
    /** The report title. */
    public final String reportTitle;
    /** The markdown report text prefix. Will not be part of copy and share operations, etc. */
-    public String reportStringPrefix;
+    public final String reportStringPrefix;
    /** The markdown report text. */
-    public String reportString;
+    public final String reportString;
    /** The markdown report text suffix. Will not be part of copy and share operations, etc. */
-    public String reportStringSuffix;
+    public final String reportStringSuffix;
    /** If set to {@code true}, then report, app and device info will be added to the report when
     * markdown is generated.
     */
-    public final boolean addReportInfoHeaderToMarkdown;
+    public final boolean addReportInfoToMarkdown;
    /** The timestamp for the report. */
    public final String reportTimestamp;

-    /** The label for the report file to save if user selects menu_item_save_report_to_file. */
-    public final String reportSaveFileLabel;
-    /** The path for the report file to save if user selects menu_item_save_report_to_file. */
-    public final String reportSaveFilePath;
-
-    public ReportInfo(String userAction, String sender, String reportTitle, String reportStringPrefix,
-                      String reportString, String reportStringSuffix, boolean addReportInfoHeaderToMarkdown,
-                      String reportSaveFileLabel, String reportSaveFilePath) {
+    public ReportInfo(UserAction userAction, String sender, String reportTitle, String reportStringPrefix, String reportString, String reportStringSuffix, boolean addReportInfoToMarkdown) {
        this.userAction = userAction;
        this.sender = sender;
        this.reportTitle = reportTitle;
        this.reportStringPrefix = reportStringPrefix;
        this.reportString = reportString;
        this.reportStringSuffix = reportStringSuffix;
-        this.addReportInfoHeaderToMarkdown = addReportInfoHeaderToMarkdown;
-        this.reportSaveFileLabel = reportSaveFileLabel;
-        this.reportSaveFilePath = reportSaveFilePath;
-        this.reportTimestamp = AndroidUtils.getCurrentMilliSecondUTCTimeStamp();
+        this.addReportInfoToMarkdown = addReportInfoToMarkdown;
+        this.reportTimestamp = TermuxUtils.getCurrentTimeStamp();
    }

    /**
@@ -60,7 +48,7 @@ public class ReportInfo implements Serializable {

        StringBuilder markdownString = new StringBuilder();

-        if (reportInfo.addReportInfoHeaderToMarkdown) {
+        if (reportInfo.addReportInfoToMarkdown) {
            markdownString.append("## Report Info\n\n");
            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("User Action", reportInfo.userAction, "-"));
            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Sender", reportInfo.sender, "-"));
@@ -2,9 +2,8 @@ package com.termux.app.models;

 public enum UserAction {

-    ABOUT("about"),
-    CRASH_REPORT("crash report"),
    PLUGIN_EXECUTION_COMMAND("plugin execution command"),
+    CRASH_REPORT("crash report"),
    REPORT_ISSUE_FROM_TRANSCRIPT("report issue from transcript");

    private final String name;
@@ -2,16 +2,12 @@ package com.termux.app.settings.properties;

 import android.content.Context;

-import androidx.annotation.NonNull;
-
 import com.termux.app.terminal.io.KeyboardShortcut;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysInfo;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysInfo;
 import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.properties.SharedPropertiesParser;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.settings.properties.TermuxSharedProperties;
-import com.termux.shared.termux.TermuxConstants;

 import org.json.JSONException;

@@ -19,16 +15,17 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

-public class TermuxAppSharedProperties extends TermuxSharedProperties {
+import javax.annotation.Nonnull;
+
+public class TermuxAppSharedProperties extends TermuxSharedProperties implements SharedPropertiesParser {

    private ExtraKeysInfo mExtraKeysInfo;
    private List<KeyboardShortcut> mSessionShortcuts = new ArrayList<>();

    private static final String LOG_TAG = "TermuxAppSharedProperties";

-    public TermuxAppSharedProperties(@NonNull Context context) {
-        super(context, TermuxConstants.TERMUX_APP_NAME, TermuxPropertyConstants.getTermuxPropertiesFile(),
-            TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, new SharedPropertiesParserClient());
+    public TermuxAppSharedProperties(@Nonnull Context context) {
+        super(context);
    }

    /**
@@ -54,20 +51,13 @@ public class TermuxAppSharedProperties extends TermuxSharedProperties {
            // {@link #getExtraKeysStyleInternalPropertyValueFromValue(String)}
            String extrakeys = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS, true);
            String extraKeysStyle = (String) getInternalPropertyValue(TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE, true);
-
-            ExtraKeysConstants.ExtraKeyDisplayMap extraKeyDisplayMap = ExtraKeysInfo.getCharDisplayMapForStyle(extraKeysStyle);
-            if (EXTRA_KEY_DISPLAY_MAPS.DEFAULT_CHAR_DISPLAY.equals(extraKeyDisplayMap) && !TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE.equals(extraKeysStyle)) {
-                Logger.logError(TermuxSharedProperties.LOG_TAG, "The style \"" + extraKeysStyle + "\" for the key \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS_STYLE + "\" is invalid. Using default style instead.");
-                extraKeysStyle = TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE;
-            }
-
-            mExtraKeysInfo = new ExtraKeysInfo(extrakeys, extraKeysStyle, ExtraKeysConstants.CONTROL_CHARS_ALIASES);
+            mExtraKeysInfo = new ExtraKeysInfo(extrakeys, extraKeysStyle);
        } catch (JSONException e) {
            Logger.showToast(mContext, "Could not load and set the \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS + "\" property from the properties file: " + e.toString(), true);
            Logger.logStackTraceWithMessage(LOG_TAG, "Could not load and set the \"" + TermuxPropertyConstants.KEY_EXTRA_KEYS + "\" property from the properties file: ", e);

            try {
-                mExtraKeysInfo = new ExtraKeysInfo(TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE, ExtraKeysConstants.CONTROL_CHARS_ALIASES);
+                mExtraKeysInfo = new ExtraKeysInfo(TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
            } catch (JSONException e2) {
                Logger.showToast(mContext, "Can't create default extra keys",true);
                Logger.logStackTraceWithMessage(LOG_TAG, "Could create default extra keys: ", e);
@@ -106,14 +96,4 @@ public class TermuxAppSharedProperties extends TermuxSharedProperties {
        return mExtraKeysInfo;
    }

-
-
-    /**
-     * Load the {@link TermuxPropertyConstants#KEY_TERMINAL_TRANSCRIPT_ROWS} value from termux properties file on disk.
-     */
-    public static int getTerminalTranscriptRows(Context context) {
-        return  (int) TermuxSharedProperties.getInternalPropertyValue(context, TermuxPropertyConstants.getTermuxPropertiesFile(),
-            TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS, new SharedPropertiesParserClient());
-    }
-
 }
@@ -1,284 +0,0 @@
-package com.termux.app.terminal;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.inputmethodservice.InputMethodService;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.WindowInsets;
-import android.view.inputmethod.EditorInfo;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-import androidx.annotation.Nullable;
-import androidx.core.view.WindowInsetsCompat;
-
-import com.termux.app.TermuxActivity;
-import com.termux.shared.logger.Logger;
-import com.termux.shared.view.ViewUtils;
-
-
-/**
- * The {@link TermuxActivity} relies on {@link android.view.WindowManager.LayoutParams#SOFT_INPUT_ADJUST_RESIZE)}
- * set by {@link TermuxTerminalViewClient#setSoftKeyboardState(boolean, boolean)} to automatically
- * resize the view and push the terminal up when soft keyboard is opened. However, this does not
- * always work properly. When `enforce-char-based-input=true` is set in `termux.properties`
- * and {@link com.termux.view.TerminalView#onCreateInputConnection(EditorInfo)} sets the inputType
- * to `InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS`
- * instead of the default `InputType.TYPE_NULL` for termux, some keyboards may still show suggestions.
- * Gboard does too, but only when text is copied and clipboard suggestions **and** number keys row
- * toggles are enabled in its settings. When number keys row toggle is not enabled, Gboard will still
- * show the row but will switch it with suggestions if needed. If its enabled, then number keys row
- * is always shown and suggestions are shown in an additional row on top of it. This additional row is likely
- * part of the candidates view returned by the keyboard app in {@link InputMethodService#onCreateCandidatesView()}.
- *
- * With the above configuration, the additional clipboard suggestions row partially covers the
- * extra keys/terminal. Reopening the keyboard/activity does not fix the issue. This is either a bug
- * in the Android OS where it does not consider the candidate's view height in its calculation to push
- * up the view or because Gboard does not include the candidate's view height in the height reported
- * to android that should be used, hence causing an overlap.
- *
- * Gboard logs the following entry to `logcat` when its opened with or without the suggestions bar showing:
- * I/KeyboardViewUtil: KeyboardViewUtil.calculateMaxKeyboardBodyHeight():62 leave 500 height for app when screen height:2392, header height:176 and isFullscreenMode:false, so the max keyboard body height is:1716
- * where `keyboard_height = screen_height - height_for_app - header_height` (62 is a hardcoded value in Gboard source code and may be a version number)
- * So this may in fact be due to Gboard but https://stackoverflow.com/questions/57567272 suggests
- * otherwise. Another similar report https://stackoverflow.com/questions/66761661.
- * Also check https://github.com/termux/termux-app/issues/1539.
- *
- * This overlap may happen even without `enforce-char-based-input=true` for keyboards with extended layouts
- * like number row, etc.
- *
- * To fix these issues, `activity_termux.xml` has the constant 1sp transparent
- * `activity_termux_bottom_space_view` View at the bottom. This will appear as a line matching the
- * activity theme. When {@link TermuxActivity} {@link ViewTreeObserver.OnGlobalLayoutListener} is
- * called when any of the sub view layouts change,  like keyboard opening/closing keyboard,
- * extra keys/input view switched, etc, we check if the bottom space view is visible or not.
- * If its not, then we add a margin to the bottom of the root view, so that the keyboard does not
- * overlap the extra keys/terminal, since the margin will push up the view. By default the margin
- * added is equal to the height of the hidden part of extra keys/terminal. For Gboard's case, the
- * hidden part equals the `header_height`. The updates to margins may cause a jitter in some cases
- * when the view is redrawn if the margin is incorrect, but logic has been implemented to avoid that.
- */
-public class TermuxActivityRootView extends LinearLayout implements ViewTreeObserver.OnGlobalLayoutListener {
-
-    public TermuxActivity mActivity;
-    public Integer marginBottom;
-    public Integer lastMarginBottom;
-    public long lastMarginBottomTime;
-    public long lastMarginBottomExtraTime;
-
-    /** Log root view events. */
-    private boolean ROOT_VIEW_LOGGING_ENABLED = false;
-
-    private static final String LOG_TAG = "TermuxActivityRootView";
-
-    private static int mStatusBarHeight;
-
-    public TermuxActivityRootView(Context context) {
-        super(context);
-    }
-
-    public TermuxActivityRootView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public TermuxActivityRootView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public void setActivity(TermuxActivity activity) {
-        mActivity = activity;
-    }
-
-    /**
-     * Sets whether root view logging is enabled or not.
-     *
-     * @param value The boolean value that defines the state.
-     */
-    public void setIsRootViewLoggingEnabled(boolean value) {
-        ROOT_VIEW_LOGGING_ENABLED = value;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-        if (marginBottom != null) {
-            if (ROOT_VIEW_LOGGING_ENABLED)
-                Logger.logVerbose(LOG_TAG, "onMeasure: Setting bottom margin to " + marginBottom);
-            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) getLayoutParams();
-            params.setMargins(0, 0, 0, marginBottom);
-            setLayoutParams(params);
-            marginBottom = null;
-            requestLayout();
-        }
-    }
-
-    @Override
-    public void onGlobalLayout() {
-        if (mActivity == null || !mActivity.isVisible()) return;
-
-        View bottomSpaceView = mActivity.getTermuxActivityBottomSpaceView();
-        if (bottomSpaceView == null) return;
-
-        boolean root_view_logging_enabled = ROOT_VIEW_LOGGING_ENABLED;
-
-        if (root_view_logging_enabled)
-            Logger.logVerbose(LOG_TAG, ":\nonGlobalLayout:");
-
-        FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) getLayoutParams();
-
-        // Get the position Rects of the bottom space view and the main window holding it
-        Rect[] windowAndViewRects = ViewUtils.getWindowAndViewRects(bottomSpaceView, mStatusBarHeight);
-        if (windowAndViewRects == null)
-            return;
-
-        Rect windowAvailableRect = windowAndViewRects[0];
-        Rect bottomSpaceViewRect = windowAndViewRects[1];
-
-        // If the bottomSpaceViewRect is inside the windowAvailableRect, then it must be completely visible
-        //boolean isVisible = windowAvailableRect.contains(bottomSpaceViewRect); // rect.right comparison often fails in landscape
-        boolean isVisible = ViewUtils.isRectAbove(windowAvailableRect, bottomSpaceViewRect);
-        boolean isVisibleBecauseMargin = (windowAvailableRect.bottom == bottomSpaceViewRect.bottom) && params.bottomMargin > 0;
-        boolean isVisibleBecauseExtraMargin = ((bottomSpaceViewRect.bottom - windowAvailableRect.bottom) < 0);
-
-        if (root_view_logging_enabled) {
-            Logger.logVerbose(LOG_TAG, "windowAvailableRect " + ViewUtils.toRectString(windowAvailableRect) + ", bottomSpaceViewRect " + ViewUtils.toRectString(bottomSpaceViewRect));
-            Logger.logVerbose(LOG_TAG, "windowAvailableRect.bottom " + windowAvailableRect.bottom +
-                ", bottomSpaceViewRect.bottom " +bottomSpaceViewRect.bottom +
-                ", diff " + (bottomSpaceViewRect.bottom - windowAvailableRect.bottom) + ", bottom " + params.bottomMargin +
-                ", isVisible " + windowAvailableRect.contains(bottomSpaceViewRect) + ", isRectAbove " + ViewUtils.isRectAbove(windowAvailableRect, bottomSpaceViewRect) +
-                ", isVisibleBecauseMargin " + isVisibleBecauseMargin + ", isVisibleBecauseExtraMargin " + isVisibleBecauseExtraMargin);
-        }
-
-        // If the bottomSpaceViewRect is visible, then remove the margin if needed
-        if (isVisible) {
-            // If visible because of margin, i.e the bottom of bottomSpaceViewRect equals that of windowAvailableRect
-            // and a margin has been added
-            // Necessary so that we don't get stuck in an infinite loop since setting margin
-            // will call OnGlobalLayoutListener again and next time bottom space view
-            // will be visible and margin will be set to 0, which again will call
-            // OnGlobalLayoutListener...
-            // Calling addTermuxActivityRootViewGlobalLayoutListener with a delay fails to
-            // set appropriate margins when views are changed quickly since some changes
-            // may be missed.
-            if (isVisibleBecauseMargin) {
-                if (root_view_logging_enabled)
-                    Logger.logVerbose(LOG_TAG, "Visible due to margin");
-
-                // Once the view has been redrawn with new margin, we set margin back to 0 so that
-                // when next time onMeasure() is called, margin 0 is used. This is necessary for
-                // cases when view has been redrawn with new margin because bottom space view was
-                // hidden by keyboard and then view was redrawn again due to layout change (like
-                // keyboard symbol view is switched to), android will add margin below its new position
-                // if its greater than 0, which was already above the keyboard creating x2x margin.
-                // Adding time check since moving split screen divider in landscape causes jitter
-                // and prevents some infinite loops
-                if ((System.currentTimeMillis() - lastMarginBottomTime) > 40) {
-                    lastMarginBottomTime = System.currentTimeMillis();
-                    marginBottom = 0;
-                } else {
-                    if (root_view_logging_enabled)
-                        Logger.logVerbose(LOG_TAG, "Ignoring restoring marginBottom to 0 since called to quickly");
-                }
-
-                return;
-            }
-
-            boolean setMargin = params.bottomMargin != 0;
-
-            // If visible because of extra margin, i.e the bottom of bottomSpaceViewRect is above that of windowAvailableRect
-            // onGlobalLayout: windowAvailableRect 1408, bottomSpaceViewRect 1232, diff -176, bottom 0, isVisible true, isVisibleBecauseMargin false, isVisibleBecauseExtraMargin false
-            // onGlobalLayout: Bottom margin already equals 0
-            if (isVisibleBecauseExtraMargin) {
-                // Adding time check since prevents infinite loops, like in landscape mode in freeform mode in Taskbar
-                if ((System.currentTimeMillis() - lastMarginBottomExtraTime) > 40) {
-                    if (root_view_logging_enabled)
-                        Logger.logVerbose(LOG_TAG, "Resetting margin since visible due to extra margin");
-                    lastMarginBottomExtraTime = System.currentTimeMillis();
-                    // lastMarginBottom must be invalid. May also happen when keyboards are changed.
-                    lastMarginBottom = null;
-                    setMargin = true;
-                } else {
-                    if (root_view_logging_enabled)
-                        Logger.logVerbose(LOG_TAG, "Ignoring resetting margin since visible due to extra margin since called to quickly");
-                }
-            }
-
-            if (setMargin) {
-                if (root_view_logging_enabled)
-                    Logger.logVerbose(LOG_TAG, "Setting bottom margin to 0");
-                params.setMargins(0, 0, 0, 0);
-                setLayoutParams(params);
-            } else {
-                if (root_view_logging_enabled)
-                    Logger.logVerbose(LOG_TAG, "Bottom margin already equals 0");
-                // This is done so that when next time onMeasure() is called, lastMarginBottom is used.
-                // This is done since we **expect** the keyboard to have same dimensions next time layout
-                // changes, so best set margin while view is drawn the first time, otherwise it will
-                // cause a jitter when OnGlobalLayoutListener is called with margin 0 and it sets the
-                // likely same lastMarginBottom again and requesting a redraw. Hopefully, this logic
-                // works fine for all cases.
-                marginBottom = lastMarginBottom;
-            }
-        }
-        // ELse find the part of the extra keys/terminal that is hidden and add a margin accordingly
-        else {
-            int pxHidden = bottomSpaceViewRect.bottom - windowAvailableRect.bottom;
-
-            if (root_view_logging_enabled)
-                Logger.logVerbose(LOG_TAG, "pxHidden " + pxHidden + ", bottom " + params.bottomMargin);
-
-            boolean setMargin = params.bottomMargin != pxHidden;
-
-            // If invisible despite margin, i.e a margin was added, but the bottom of bottomSpaceViewRect
-            // is still below that of windowAvailableRect, this will trigger OnGlobalLayoutListener
-            // again, so that margins are set properly. May happen when toolbar/extra keys is disabled
-            // and enabled from left drawer, just like case for isVisibleBecauseExtraMargin.
-            // onMeasure: Setting bottom margin to 176
-            // onGlobalLayout: windowAvailableRect 1232, bottomSpaceViewRect 1408, diff 176, bottom 176, isVisible false, isVisibleBecauseMargin false, isVisibleBecauseExtraMargin false
-            // onGlobalLayout: Bottom margin already equals 176
-            if (pxHidden > 0 && params.bottomMargin > 0) {
-                if (pxHidden != params.bottomMargin) {
-                    if (root_view_logging_enabled)
-                        Logger.logVerbose(LOG_TAG, "Force setting margin to 0 since not visible due to wrong margin");
-                    pxHidden = 0;
-                } else {
-                    if (root_view_logging_enabled)
-                        Logger.logVerbose(LOG_TAG, "Force setting margin since not visible despite required margin");
-                }
-                setMargin = true;
-            }
-
-            if (pxHidden  < 0) {
-                if (root_view_logging_enabled)
-                    Logger.logVerbose(LOG_TAG, "Force setting margin to 0 since new margin is negative");
-                pxHidden = 0;
-            }
-
-
-            if (setMargin) {
-                if (root_view_logging_enabled)
-                    Logger.logVerbose(LOG_TAG, "Setting bottom margin to " + pxHidden);
-                params.setMargins(0, 0, 0, pxHidden);
-                setLayoutParams(params);
-                lastMarginBottom = pxHidden;
-            } else {
-                if (root_view_logging_enabled)
-                    Logger.logVerbose(LOG_TAG, "Bottom margin already equals " + pxHidden);
-            }
-        }
-    }
-
-    public static class WindowInsetsListener implements View.OnApplyWindowInsetsListener {
-        @Override
-        public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
-            mStatusBarHeight =  WindowInsetsCompat.toWindowInsetsCompat(insets).getInsets(WindowInsetsCompat.Type.statusBars()).top;
-            // Let view window handle insets however it wants
-            return v.onApplyWindowInsets(insets);
-        }
-    }
-
-}
@@ -14,13 +14,13 @@ import android.widget.ListView;

 import com.termux.R;
 import com.termux.shared.shell.TermuxSession;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.interact.DialogUtils;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.app.TermuxService;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.terminal.io.BellHandler;
+import com.termux.app.terminal.io.BellHandler;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
@@ -37,76 +37,20 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase

    private static final int MAX_SESSIONS = 8;

-    private SoundPool mBellSoundPool;
+    private final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
+        new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();

-    private int mBellSoundId;
+    private final int mBellSoundId;

    private static final String LOG_TAG = "TermuxTerminalSessionClient";

    public TermuxTerminalSessionClient(TermuxActivity activity) {
        this.mActivity = activity;
+
+        mBellSoundId = mBellSoundPool.load(activity, R.raw.bell, 1);
    }

-    /**
-     * Should be called when mActivity.onCreate() is called
-     */
-    public void onCreate() {
-        // Set terminal fonts and colors
-        checkForFontAndColors();
-    }
-
-    /**
-     * Should be called when mActivity.onStart() is called
-     */
-    public void onStart() {
-        // The service has connected, but data may have changed since we were last in the foreground.
-        // Get the session stored in shared preferences stored by {@link #onStop} if its valid,
-        // otherwise get the last session currently running.
-        if (mActivity.getTermuxService() != null) {
-            setCurrentSession(getCurrentStoredSessionOrLast());
-            termuxSessionListNotifyUpdated();
-        }
-
-        // The current terminal session may have changed while being away, force
-        // a refresh of the displayed terminal.
-        mActivity.getTerminalView().onScreenUpdated();
-    }
-
-    /**
-     * Should be called when mActivity.onResume() is called
-     */
-    public void onResume() {
-        // Just initialize the mBellSoundPool and load the sound, otherwise bell might not run
-        // the first time bell key is pressed and play() is called, since sound may not be loaded
-        // quickly enough before the call to play(). https://stackoverflow.com/questions/35435625
-        getBellSoundPool();
-    }
-
-    /**
-     * Should be called when mActivity.onStop() is called
-     */
-    public void onStop() {
-        // Store current session in shared preferences so that it can be restored later in
-        // {@link #onStart} if needed.
-        setCurrentStoredSession();
-
-        // Release mBellSoundPool resources, specially to prevent exceptions like the following to be thrown
-        // java.util.concurrent.TimeoutException: android.media.SoundPool.finalize() timed out after 10 seconds
-        // Bell is not played in background anyways
-        // Related: https://stackoverflow.com/a/28708351/14686958
-        releaseBellSoundPool();
-    }
-
-    /**
-     * Should be called when mActivity.reloadActivityStyling() is called
-     */
-    public void onReload() {
-        // Set terminal fonts and colors
-        checkForFontAndColors();
-    }
-
-
-
    @Override
    public void onTextChanged(TerminalSession changedSession) {
        if (!mActivity.isVisible()) return;
@@ -138,61 +82,37 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
            return;
        }

-        int index = service.getIndexOfSession(finishedSession);
-
-        // For plugin commands that expect the result back, we should immediately close the session
-        // and send the result back instead of waiting fo the user to press enter.
-        // The plugin can handle/show errors itself.
-        boolean isPluginExecutionCommandWithPendingResult = false;
-        TermuxSession termuxSession = service.getTermuxSession(index);
-        if (termuxSession != null) {
-            isPluginExecutionCommandWithPendingResult = termuxSession.getExecutionCommand().isPluginExecutionCommandWithPendingResult();
-            if (isPluginExecutionCommandWithPendingResult)
-                Logger.logVerbose(LOG_TAG, "The \"" + finishedSession.mSessionName + "\" session will be force finished automatically since result in pending.");
-        }
-
        if (mActivity.isVisible() && finishedSession != mActivity.getCurrentSession()) {
            // Show toast for non-current sessions that exit.
+            int indexOfSession = service.getIndexOfSession(finishedSession);
            // Verify that session was not removed before we got told about it finishing:
-            if (index >= 0)
+            if (indexOfSession >= 0)
                mActivity.showToast(toToastTitle(finishedSession) + " - exited", true);
        }

        if (mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
            // On Android TV devices we need to use older behaviour because we may
            // not be able to have multiple launcher icons.
-            if (service.getTermuxSessionsSize() > 1 || isPluginExecutionCommandWithPendingResult) {
+            if (service.getTermuxSessionsSize() > 1) {
                removeFinishedSession(finishedSession);
            }
        } else {
            // Once we have a separate launcher icon for the failsafe session, it
            // should be safe to auto-close session on exit code '0' or '130'.
-            if (finishedSession.getExitStatus() == 0 || finishedSession.getExitStatus() == 130 || isPluginExecutionCommandWithPendingResult) {
+            if (finishedSession.getExitStatus() == 0 || finishedSession.getExitStatus() == 130) {
                removeFinishedSession(finishedSession);
            }
        }
    }

    @Override
-    public void onCopyTextToClipboard(TerminalSession session, String text) {
+    public void onClipboardText(TerminalSession session, String text) {
        if (!mActivity.isVisible()) return;

        ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
        clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(text)));
    }

-    @Override
-    public void onPasteTextFromClipboard(TerminalSession session) {
-        if (!mActivity.isVisible()) return;
-
-        ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clipData = clipboard.getPrimaryClip();
-        if (clipData != null) {
-            CharSequence paste = clipData.getItemAt(0).coerceToText(mActivity);
-            if (!TextUtils.isEmpty(paste)) mActivity.getTerminalView().mEmulator.paste(paste.toString());
-        }
-    }
-
    @Override
    public void onBell(TerminalSession session) {
        if (!mActivity.isVisible()) return;
@@ -202,12 +122,13 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
                BellHandler.getInstance(mActivity).doBell();
                break;
            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
-                getBellSoundPool().play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
                break;
            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
                // Ignore the bell character.
                break;
        }
+
    }

    @Override
@@ -216,58 +137,6 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
            updateBackgroundColor();
    }

-    @Override
-    public void onTerminalCursorStateChange(boolean enabled) {
-        // Do not start cursor blinking thread if activity is not visible
-        if (enabled && !mActivity.isVisible()) {
-            Logger.logVerbose(LOG_TAG, "Ignoring call to start cursor blinking since activity is not visible");
-            return;
-        }
-
-        // If cursor is to enabled now, then start cursor blinking if blinking is enabled
-        // otherwise stop cursor blinking
-        mActivity.getTerminalView().setTerminalCursorBlinkerState(enabled, false);
-    }
-
-    /**
-     * Should be called when mActivity.onResetTerminalSession() is called
-     */
-    public void onResetTerminalSession() {
-        // Ensure blinker starts again after reset if cursor blinking was disabled before reset like
-        // with "tput civis" which would have called onTerminalCursorStateChange()
-        mActivity.getTerminalView().setTerminalCursorBlinkerState(true, true);
-    }
-
-
-
-    @Override
-    public Integer getTerminalCursorStyle() {
-        return mActivity.getProperties().getTerminalCursorStyle();
-    }
-
-
-
-    /** Initialize and get mBellSoundPool */
-    private synchronized SoundPool getBellSoundPool() {
-        if (mBellSoundPool == null) {
-            mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
-                new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
-
-            mBellSoundId = mBellSoundPool.load(mActivity, R.raw.bell, 1);
-        }
-
-        return mBellSoundPool;
-    }
-
-    /** Release mBellSoundPool resources */
-    private synchronized void releaseBellSoundPool() {
-        if (mBellSoundPool != null) {
-            mBellSoundPool.release();
-            mBellSoundPool = null;
-        }
-    }
-


    /** Try switching to session. */
@@ -288,10 +157,8 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
    void notifyOfSessionChange() {
        if (!mActivity.isVisible()) return;

-        if (!mActivity.getProperties().areTerminalSessionChangeToastsDisabled()) {
-            TerminalSession session = mActivity.getCurrentSession();
-            mActivity.showToast(toToastTitle(session), false);
-        }
+        TerminalSession session = mActivity.getCurrentSession();
+        mActivity.showToast(toToastTitle(session), false);
    }

    public void switchToSession(boolean forward) {
@@ -325,7 +192,7 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
    public void renameSession(final TerminalSession sessionToRename) {
        if (sessionToRename == null) return;

-        TextInputDialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
+        DialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
            sessionToRename.mSessionName = text;
            termuxSessionListNotifyUpdated();
        }, -1, null, -1, null, null);
@@ -9,41 +9,32 @@ import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
 import android.net.Uri;
-import android.os.Environment;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;

 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.data.UrlUtils;
-import com.termux.shared.file.FileUtils;
-import com.termux.shared.interact.MessageDialogUtils;
-import com.termux.shared.interact.ShareUtils;
 import com.termux.shared.shell.ShellUtils;
 import com.termux.shared.terminal.TermuxTerminalViewClientBase;
-import com.termux.shared.terminal.io.extrakeys.SpecialButton;
-import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
-import com.termux.shared.activities.ReportActivity;
-import com.termux.shared.models.ReportInfo;
+import com.termux.app.activities.ReportActivity;
+import com.termux.app.models.ReportInfo;
 import com.termux.app.models.UserAction;
 import com.termux.app.terminal.io.KeyboardShortcut;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.termux.TermuxUtils;
 import com.termux.shared.view.KeyboardUtils;
-import com.termux.shared.view.ViewUtils;
 import com.termux.terminal.KeyHandler;
-import com.termux.terminal.TerminalBuffer;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;

@@ -65,11 +56,6 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {

    private Runnable mShowSoftKeyboardRunnable;

-    private boolean mShowSoftKeyboardIgnoreOnce;
-    private boolean mShowSoftKeyboardWithDelayOnce;
-
-    private boolean mTerminalCursorBlinkerStateAlreadySet;
-
    private static final String LOG_TAG = "TermuxTerminalViewClient";

    public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) {
@@ -77,89 +63,6 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
        this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
    }

-    public TermuxActivity getActivity() {
-        return mActivity;
-    }
-
-    /**
-     * Should be called when mActivity.onCreate() is called
-     */
-    public void onCreate() {
-        mActivity.getTerminalView().setTextSize(mActivity.getPreferences().getFontSize());
-        mActivity.getTerminalView().setKeepScreenOn(mActivity.getPreferences().shouldKeepScreenOn());
-    }
-
-    /**
-     * Should be called when mActivity.onStart() is called
-     */
-    public void onStart() {
-        // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
-        // Also required if user changed the preference from {@link TermuxSettings} activity and returns
-        boolean isTerminalViewKeyLoggingEnabled = mActivity.getPreferences().isTerminalViewKeyLoggingEnabled();
-        mActivity.getTerminalView().setIsTerminalViewKeyLoggingEnabled(isTerminalViewKeyLoggingEnabled);
-
-        // Piggyback on the terminal view key logging toggle for now, should add a separate toggle in future
-        mActivity.getTermuxActivityRootView().setIsRootViewLoggingEnabled(isTerminalViewKeyLoggingEnabled);
-        ViewUtils.setIsViewUtilsLoggingEnabled(isTerminalViewKeyLoggingEnabled);
-    }
-
-    /**
-     * Should be called when mActivity.onResume() is called
-     */
-    public void onResume() {
-        // Show the soft keyboard if required
-        setSoftKeyboardState(true, false);
-
-        mTerminalCursorBlinkerStateAlreadySet = false;
-
-        if (mActivity.getTerminalView().mEmulator != null) {
-            // Start terminal cursor blinking if enabled
-            // If emulator is already set, then start blinker now, otherwise wait for onEmulatorSet()
-            // event to start it. This is needed since onEmulatorSet() may not be called after
-            // TermuxActivity is started after device display timeout with double tap and not power button.
-            setTerminalCursorBlinkerState(true);
-            mTerminalCursorBlinkerStateAlreadySet = true;
-        }
-    }
-
-    /**
-     * Should be called when mActivity.onStop() is called
-     */
-    public void onStop() {
-        // Stop terminal cursor blinking if enabled
-        setTerminalCursorBlinkerState(false);
-    }
-
-    /**
-     * Should be called when mActivity.reloadActivityStyling() is called
-     */
-    public void onReload() {
-        // Show the soft keyboard if required
-        setSoftKeyboardState(false, true);
-
-        // Start terminal cursor blinking if enabled
-        setTerminalCursorBlinkerState(true);
-    }
-
-    /**
-     * Should be called when {@link com.termux.view.TerminalView#mEmulator} is set
-     */
-    @Override
-    public void onEmulatorSet() {
-        if (!mTerminalCursorBlinkerStateAlreadySet) {
-            // Start terminal cursor blinking if enabled
-            // We need to wait for the first session to be attached that's set in
-            // TermuxActivity.onServiceConnected() and then the multiple calls to TerminalView.updateSize()
-            // where the final one eventually sets the mEmulator when width/height is not 0. Otherwise
-            // blinker will not start again if TermuxActivity is started again after exiting it with
-            // double back press. Check TerminalView.setTerminalCursorBlinkerState().
-            setTerminalCursorBlinkerState(true);
-            mTerminalCursorBlinkerStateAlreadySet = true;
-        }
-    }
-
-
-
    @Override
    public float onScale(float scale) {
        if (scale < 0.9f || scale > 1.1f) {
@@ -174,26 +77,10 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {

    @Override
    public void onSingleTapUp(MotionEvent e) {
-        TerminalEmulator term = mActivity.getCurrentSession().getEmulator();
-
-        if (mActivity.getProperties().shouldOpenTerminalTranscriptURLOnClick()) {
-            int[] columnAndRow = mActivity.getTerminalView().getColumnAndRow(e, true);
-            String wordAtTap = term.getScreen().getWordAtLocation(columnAndRow[0], columnAndRow[1]);
-            LinkedHashSet<CharSequence> urlSet = UrlUtils.extractUrls(wordAtTap);
-
-            if (!urlSet.isEmpty()) {
-                String url = (String) urlSet.iterator().next();
-                ShareUtils.openURL(mActivity, url);
-                return;
-            }
-        }
-
-        if (!term.isMouseTrackingActive() && !e.isFromSource(InputDevice.SOURCE_MOUSE)) {
-            if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity))
-                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
-            else
-                Logger.logVerbose(LOG_TAG, "Not showing soft keyboard onSingleTapUp since its disabled");
-        }
+        if (!KeyboardUtils.areDisableSoftKeyboardFlagsSet(mActivity))
+            KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+        else
+            Logger.logVerbose(LOG_TAG, "Not showing keyboard onSingleTapUp since its disabled");
    }

    @Override
@@ -211,11 +98,6 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
        return mActivity.getProperties().isUsingCtrlSpaceWorkaround();
    }

-    @Override
-    public boolean isTerminalViewSelected() {
-        return mActivity.getTerminalToolbarViewPager() == null || mActivity.isTerminalViewSelected();
-    }
-


    @Override
@@ -234,8 +116,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
        if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
            mTermuxTerminalSessionClient.removeFinishedSession(currentSession);
            return true;
-        } else if (!mActivity.getProperties().areHardwareKeyboardShortcutsDisabled() &&
-            e.isCtrlPressed() && e.isAltPressed()) {
+        } else if (e.isCtrlPressed() && e.isAltPressed()) {
            // Get the unmodified code point:
            int unicodeChar = e.getUnicodeChar(0);

@@ -280,13 +161,6 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {

    @Override
    public boolean onKeyUp(int keyCode, KeyEvent e) {
-        // If emulator is not set, like if bootstrap installation failed and user dismissed the error
-        // dialog, then just exit the activity, otherwise they will be stuck in a broken state.
-        if (keyCode == KeyEvent.KEYCODE_BACK && mActivity.getTerminalView().mEmulator == null) {
-            mActivity.finishActivityIfNotFinishing();
-            return true;
-        }
-
        return handleVirtualKeys(keyCode, e, false);
    }

@@ -312,32 +186,12 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {

    @Override
    public boolean readControlKey() {
-        return readExtraKeysSpecialButton(SpecialButton.CTRL) || mVirtualControlKeyDown;
+        return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
    }

    @Override
    public boolean readAltKey() {
-        return readExtraKeysSpecialButton(SpecialButton.ALT);
-    }
-
-    @Override
-    public boolean readShiftKey() {
-        return readExtraKeysSpecialButton(SpecialButton.SHIFT);
-    }
-
-    @Override
-    public boolean readFnKey() {
-        return readExtraKeysSpecialButton(SpecialButton.FN);
-    }
-
-    public boolean readExtraKeysSpecialButton(SpecialButton specialButton) {
-        if (mActivity.getExtraKeysView() == null) return false;
-        Boolean state = mActivity.getExtraKeysView().readSpecialButton(specialButton, true);
-        if (state == null) {
-            Logger.logError(LOG_TAG,"Failed to read an unregistered " + specialButton + " special button value from extra keys.");
-            return false;
-        }
-        return state;
+        return (mActivity.getExtraKeysView() != null && mActivity.getExtraKeysView().readSpecialButton(ExtraKeysView.SpecialButton.ALT));
    }

    @Override
@@ -505,25 +359,16 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
                mActivity.getPreferences().setSoftKeyboardEnabled(false);
                KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
            } else {
-                // Show with a delay, otherwise pressing keyboard toggle won't show the keyboard after
-                // switching back from another app if keyboard was previously disabled by user.
-                // Also request focus, since it wouldn't have been requested at startup by
-                // setSoftKeyboardState if keyboard was disabled. #2112
                Logger.logVerbose(LOG_TAG, "Enabling soft keyboard on toggle");
                mActivity.getPreferences().setSoftKeyboardEnabled(true);
                KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
-                if(mShowSoftKeyboardWithDelayOnce) {
-                    mShowSoftKeyboardWithDelayOnce = false;
-                    mActivity.getTerminalView().postDelayed(getShowSoftKeyboardRunnable(), 500);
-                    mActivity.getTerminalView().requestFocus();
-                } else
-                    KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
            }
        }
        // If soft keyboard toggle behaviour is show/hide
        else {
            // If soft keyboard is disabled by user for Termux
-            if (!mActivity.getPreferences().isSoftKeyboardEnabled()) {
+            if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
                Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard on toggle");
                KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
            } else {
@@ -535,30 +380,13 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
    }

    public void setSoftKeyboardState(boolean isStartup, boolean isReloadTermuxProperties) {
-        boolean noShowKeyboard = false;
-
-        // Requesting terminal view focus is necessary regardless of if soft keyboard is to be
-        // disabled or hidden at startup, otherwise if hardware keyboard is attached and user
-        // starts typing on hardware keyboard without tapping on the terminal first, then a colour
-        // tint will be added to the terminal as highlight for the focussed view. Test with a light
-        // theme.
-
-        // If soft keyboard is disabled by user for Termux (check function docs for Termux behaviour info)
-        if (KeyboardUtils.shouldSoftKeyboardBeDisabled(mActivity,
-            mActivity.getPreferences().isSoftKeyboardEnabled(),
-            mActivity.getPreferences().isSoftKeyboardEnabledOnlyIfNoHardware())) {
+        // If soft keyboard is disabled by user for Termux
+        if (!mActivity.getPreferences().getSoftKeyboardEnabled()) {
            Logger.logVerbose(LOG_TAG, "Maintaining disabled soft keyboard");
            KeyboardUtils.disableSoftKeyboard(mActivity, mActivity.getTerminalView());
-            mActivity.getTerminalView().requestFocus();
-            noShowKeyboard = true;
-            // Delay is only required if onCreate() is called like when Termux app is exited with
-            // double back press, not when Termux app is switched back from another app and keyboard
-            // toggle is pressed to enable keyboard
-            if (isStartup && mActivity.isOnResumeAfterOnCreate())
-                mShowSoftKeyboardWithDelayOnce = true;
        } else {
            // Set flag to automatically push up TerminalView when keyboard is opened instead of showing over it
-            KeyboardUtils.setSoftInputModeAdjustResize(mActivity);
+            KeyboardUtils.setResizeTerminalViewForSoftKeyboardFlags(mActivity);

            // Clear any previous flags to disable soft keyboard in case setting updated
            KeyboardUtils.clearDisableSoftKeyboardFlags(mActivity);
@@ -566,74 +394,32 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
            // If soft keyboard is to be hidden on startup
            if (isStartup && mActivity.getProperties().shouldSoftKeyboardBeHiddenOnStartup()) {
                Logger.logVerbose(LOG_TAG, "Hiding soft keyboard on startup");
+                KeyboardUtils.hideSoftKeyboard(mActivity, mActivity.getTerminalView());
                // Required to keep keyboard hidden when Termux app is switched back from another app
                KeyboardUtils.setSoftKeyboardAlwaysHiddenFlags(mActivity);
+            } else {
+                // Do not force show soft keyboard if termux-reload-settings command was run with hardware keyboard
+                if (isReloadTermuxProperties)
+                    return;

-                KeyboardUtils.hideSoftKeyboard(mActivity, mActivity.getTerminalView());
-                mActivity.getTerminalView().requestFocus();
-                noShowKeyboard = true;
-                // Required to keep keyboard hidden on app startup
-                mShowSoftKeyboardIgnoreOnce = true;
-            }
-        }
-
-        mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View view, boolean hasFocus) {
-                // Force show soft keyboard if TerminalView or toolbar text input view has
-                // focus and close it if they don't
-                boolean textInputViewHasFocus = false;
-                final EditText textInputView =  mActivity.findViewById(R.id.terminal_toolbar_text_input);
-                if (textInputView != null) textInputViewHasFocus = textInputView.hasFocus();
-
-                if (hasFocus || textInputViewHasFocus) {
-                    if (mShowSoftKeyboardIgnoreOnce) {
-                        mShowSoftKeyboardIgnoreOnce = false; return;
-                    }
-                    Logger.logVerbose(LOG_TAG, "Showing soft keyboard on focus change");
-                } else {
-                    Logger.logVerbose(LOG_TAG, "Hiding soft keyboard on focus change");
+                if (mShowSoftKeyboardRunnable == null) {
+                    mShowSoftKeyboardRunnable = () -> {
+                        Logger.logVerbose(LOG_TAG, "Showing soft keyboard on focus change");
+                        KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+                    };
                }

-                KeyboardUtils.setSoftKeyboardVisibility(getShowSoftKeyboardRunnable(), mActivity, mActivity.getTerminalView(), hasFocus || textInputViewHasFocus);
+                mActivity.getTerminalView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View view, boolean hasFocus) {
+                        // Force show soft keyboard if TerminalView has focus and close it if it doesn't
+                        KeyboardUtils.setSoftKeyboardVisibility(mShowSoftKeyboardRunnable, mActivity, mActivity.getTerminalView(), hasFocus);
+                    }
+                });
+
+                // Request focus for TerminalView
+                mActivity.getTerminalView().requestFocus();
            }
-        });
-
-        // Do not force show soft keyboard if termux-reload-settings command was run with hardware keyboard
-        // or soft keyboard is to be hidden or is disabled
-        if (!isReloadTermuxProperties && !noShowKeyboard) {
-            // Request focus for TerminalView
-            // Also show the keyboard, since onFocusChange will not be called if TerminalView already
-            // had focus on startup to show the keyboard, like when opening url with context menu
-            // "Select URL" long press and returning to Termux app with back button. This
-            // will also show keyboard even if it was closed before opening url. #2111
-            Logger.logVerbose(LOG_TAG, "Requesting TerminalView focus and showing soft keyboard");
-            mActivity.getTerminalView().requestFocus();
-            mActivity.getTerminalView().postDelayed(getShowSoftKeyboardRunnable(), 300);
-        }
-    }
-
-    private Runnable getShowSoftKeyboardRunnable() {
-        if (mShowSoftKeyboardRunnable == null) {
-            mShowSoftKeyboardRunnable = () -> {
-                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
-            };
-        }
-        return mShowSoftKeyboardRunnable;
-    }
-
-
-
-    public void setTerminalCursorBlinkerState(boolean start) {
-        if (start) {
-            // If set/update the cursor blinking rate is successful, then enable cursor blinker
-            if (mActivity.getTerminalView().setTerminalCursorBlinkerRate(mActivity.getProperties().getTerminalCursorBlinkRate()))
-                mActivity.getTerminalView().setTerminalCursorBlinkerState(true, true);
-            else
-                Logger.logError(LOG_TAG,"Failed to start cursor blinker");
-        } else {
-            // Disable cursor blinker
-            mActivity.getTerminalView().setTerminalCursorBlinkerState(false, true);
        }
    }

@@ -655,7 +441,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
            intent.putExtra(Intent.EXTRA_SUBJECT, mActivity.getString(R.string.title_share_transcript));
            mActivity.startActivity(Intent.createChooser(intent, mActivity.getString(R.string.title_share_transcript_with)));
        } catch (Exception e) {
-            Logger.logStackTraceWithMessage(LOG_TAG,"Failed to get share session transcript of length " + transcriptText.length(), e);
+            Logger.logStackTraceWithMessage("Failed to get share session transcript of length " + transcriptText.length(), e);
        }
    }

@@ -665,7 +451,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {

        String text = ShellUtils.getTerminalSessionTranscriptText(session, true, true);

-        LinkedHashSet<CharSequence> urlSet = UrlUtils.extractUrls(text);
+        LinkedHashSet<CharSequence> urlSet = DataUtils.extractUrls(text);
        if (urlSet.isEmpty()) {
            new AlertDialog.Builder(mActivity).setMessage(R.string.title_select_url_none_found).show();
            return;
@@ -688,7 +474,13 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
            lv.setOnItemLongClickListener((parent, view, position, id) -> {
                dialog.dismiss();
                String url = (String) urls[position];
-                ShareUtils.openURL(mActivity, url);
+                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                try {
+                    mActivity.startActivity(i, null);
+                } catch (ActivityNotFoundException e) {
+                    // If no applications match, Android displays a system message.
+                    mActivity.startActivity(Intent.createChooser(i, null));
+                }
                return true;
            });
        });
@@ -700,54 +492,26 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
        TerminalSession session = mActivity.getCurrentSession();
        if (session == null) return;

-        final String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
+        String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
        if (transcriptText == null) return;

-        MessageDialogUtils.showMessage(mActivity, TermuxConstants.TERMUX_APP_NAME + " Report Issue",
-            mActivity.getString(R.string.msg_add_termux_debug_info),
-            mActivity.getString(R.string.action_yes), (dialog, which) -> reportIssueFromTranscript(transcriptText, true),
-            mActivity.getString(R.string.action_no), (dialog, which) -> reportIssueFromTranscript(transcriptText, false),
-            null);
-    }
+        transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();

-    private void reportIssueFromTranscript(String transcriptText, boolean addTermuxDebugInfo) {
-        Logger.showToast(mActivity, mActivity.getString(R.string.msg_generating_report), true);
+        StringBuilder reportString = new StringBuilder();

-        new Thread() {
-            @Override
-            public void run() {
-                StringBuilder reportString = new StringBuilder();
+        String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";

-                String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
+        reportString.append("## Transcript\n");
+        reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptText, true));

-                reportString.append("## Transcript\n");
-                reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptText, true));
-                reportString.append("\n##\n");
+        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
+        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));

-                reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
-                reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(mActivity));
+        String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
+        if (termuxAptInfo != null)
+            reportString.append("\n\n").append(termuxAptInfo);

-                String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
-                if (termuxAptInfo != null)
-                    reportString.append("\n\n").append(termuxAptInfo);
-
-                if (addTermuxDebugInfo) {
-                    String termuxDebugInfo = TermuxUtils.getTermuxDebugMarkdownString(mActivity);
-                    if (termuxDebugInfo != null)
-                        reportString.append("\n\n").append(termuxDebugInfo);
-                }
-
-                String userActionName = UserAction.REPORT_ISSUE_FROM_TRANSCRIPT.getName();
-                ReportActivity.startReportActivity(mActivity,
-                    new ReportInfo(userActionName,
-                        TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null,
-                        reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity),
-                        false,
-                        userActionName,
-                        Environment.getExternalStorageDirectory() + "/" +
-                            FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
-            }
-        }.start();
+        ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT, TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false));
    }

    public void doPaste() {
@@ -1,21 +1,15 @@
-package com.termux.shared.terminal.io;
+package com.termux.app.terminal.io;

 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.os.VibrationEffect;
 import android.os.Vibrator;

-import com.termux.shared.logger.Logger;
-
 public class BellHandler {
    private static BellHandler instance = null;
    private static final Object lock = new Object();

-    private static final String LOG_TAG = "BellHandler";
-
    public static BellHandler getInstance(Context context) {
        if (instance == null) {
            synchronized (lock) {
@@ -40,17 +34,7 @@ public class BellHandler {
            @Override
            public void run() {
                if (vibrator != null) {
-                    try {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                            vibrator.vibrate(VibrationEffect.createOneShot(DURATION, VibrationEffect.DEFAULT_AMPLITUDE));
-                        } else {
-                            vibrator.vibrate(DURATION);
-                        }
-                    } catch (Exception e) {
-                        // Issue on samsung devices on android 8
-                        // java.lang.NullPointerException: Attempt to read from field 'android.os.VibrationEffect com.android.server.VibratorService$Vibration.mEffect' on a null object reference
-                        Logger.logStackTraceWithMessage(LOG_TAG, "Failed to run vibrator", e);
-                    }
+                    vibrator.vibrate(DURATION);
                }
            }
        };
@@ -11,7 +11,7 @@ import androidx.viewpager.widget.ViewPager;

 import com.termux.R;
 import com.termux.app.TermuxActivity;
-import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
+import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.terminal.TerminalSession;

 public class TerminalToolbarViewPager {
@@ -44,9 +44,7 @@ public class TerminalToolbarViewPager {
            if (position == 0) {
                layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
                ExtraKeysView extraKeysView = (ExtraKeysView) layout;
-                extraKeysView.setExtraKeysViewClient(new TermuxTerminalExtraKeys(mActivity.getTerminalView(),
-                    mActivity.getTermuxTerminalViewClient(), mActivity.getTermuxTerminalSessionClient()));
-                extraKeysView.setButtonTextAllCaps(mActivity.getProperties().shouldExtraKeysTextBeAllCaps());
+                extraKeysView.setTermuxTerminalViewClient(mActivity.getTermuxTerminalViewClient());
                mActivity.setExtraKeysView(extraKeysView);
                extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());

@@ -1,49 +0,0 @@
-package com.termux.app.terminal.io;
-
-import android.annotation.SuppressLint;
-import android.view.Gravity;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.drawerlayout.widget.DrawerLayout;
-
-import com.termux.app.terminal.TermuxTerminalSessionClient;
-import com.termux.app.terminal.TermuxTerminalViewClient;
-import com.termux.shared.terminal.io.TerminalExtraKeys;
-import com.termux.view.TerminalView;
-
-public class TermuxTerminalExtraKeys extends TerminalExtraKeys {
-
-
-    TermuxTerminalViewClient mTermuxTerminalViewClient;
-    TermuxTerminalSessionClient mTermuxTerminalSessionClient;
-
-    public TermuxTerminalExtraKeys(@NonNull TerminalView terminalView,
-                                   TermuxTerminalViewClient termuxTerminalViewClient,
-                                   TermuxTerminalSessionClient termuxTerminalSessionClient) {
-        super(terminalView);
-        mTermuxTerminalViewClient = termuxTerminalViewClient;
-        mTermuxTerminalSessionClient = termuxTerminalSessionClient;
-    }
-
-    @SuppressLint("RtlHardcoded")
-    @Override
-    public void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDown, boolean altDown, boolean shiftDown, boolean fnDown) {
-        if ("KEYBOARD".equals(key)) {
-            if(mTermuxTerminalViewClient != null)
-                mTermuxTerminalViewClient.onToggleSoftKeyboardRequest();
-        } else if ("DRAWER".equals(key)) {
-            DrawerLayout drawerLayout = mTermuxTerminalViewClient.getActivity().getDrawer();
-            if (drawerLayout.isDrawerOpen(Gravity.LEFT))
-                drawerLayout.closeDrawer(Gravity.LEFT);
-            else
-                drawerLayout.openDrawer(Gravity.LEFT);
-        } else if ("PASTE".equals(key)) {
-            if(mTermuxTerminalSessionClient != null)
-                mTermuxTerminalSessionClient.onPasteTextFromClipboard(null);
-        } else {
-            super.onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
-        }
-    }
-
-}
@@ -0,0 +1,92 @@
+package com.termux.app.terminal.io.extrakeys;
+
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class ExtraKeyButton {
+
+    /**
+     * The key that will be sent to the terminal, either a control character
+     * defined in ExtraKeysView.keyCodesForString (LEFT, RIGHT, PGUP...) or
+     * some text.
+     */
+    private final String key;
+
+    /**
+     * If the key is a macro, i.e. a sequence of keys separated by space.
+     */
+    private final boolean macro;
+
+    /**
+     * The text that will be shown on the button.
+     */
+    private final String display;
+
+    /**
+     * The information of the popup (triggered by swipe up).
+     */
+    @Nullable
+    private ExtraKeyButton popup;
+
+    public ExtraKeyButton(ExtraKeysInfo.CharDisplayMap charDisplayMap, JSONObject config) throws JSONException {
+        this(charDisplayMap, config, null);
+    }
+
+    public ExtraKeyButton(ExtraKeysInfo.CharDisplayMap charDisplayMap, JSONObject config, @Nullable ExtraKeyButton popup) throws JSONException {
+        String keyFromConfig = config.optString("key", null);
+        String macroFromConfig = config.optString("macro", null);
+        String[] keys;
+        if (keyFromConfig != null && macroFromConfig != null) {
+            throw new JSONException("Both key and macro can't be set for the same key");
+        } else if (keyFromConfig != null) {
+            keys = new String[]{keyFromConfig};
+            this.macro = false;
+        } else if (macroFromConfig != null) {
+            keys = macroFromConfig.split(" ");
+            this.macro = true;
+        } else {
+            throw new JSONException("All keys have to specify either key or macro");
+        }
+
+        for (int i = 0; i < keys.length; i++) {
+            keys[i] = ExtraKeysInfo.replaceAlias(keys[i]);
+        }
+
+        this.key = TextUtils.join(" ", keys);
+
+        String displayFromConfig = config.optString("display", null);
+        if (displayFromConfig != null) {
+            this.display = displayFromConfig;
+        } else {
+            this.display = Arrays.stream(keys)
+                .map(key -> charDisplayMap.get(key, key))
+                .collect(Collectors.joining(" "));
+        }
+
+        this.popup = popup;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public boolean isMacro() {
+        return macro;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    @Nullable
+    public ExtraKeyButton getPopup() {
+        return popup;
+    }
+}
@@ -0,0 +1,253 @@
+package com.termux.app.terminal.io.extrakeys;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+public class ExtraKeysInfo {
+
+    /**
+     * Matrix of buttons displayed
+     */
+    private final ExtraKeyButton[][] buttons;
+
+    /**
+     * This corresponds to one of the CharMapDisplay below
+     */
+    private String style;
+
+    public ExtraKeysInfo(String propertiesInfo, String style) throws JSONException {
+        this.style = style;
+
+        // Convert String propertiesInfo to Array of Arrays
+        JSONArray arr = new JSONArray(propertiesInfo);
+        Object[][] matrix = new Object[arr.length()][];
+        for (int i = 0; i < arr.length(); i++) {
+            JSONArray line = arr.getJSONArray(i);
+            matrix[i] = new Object[line.length()];
+            for (int j = 0; j < line.length(); j++) {
+                matrix[i][j] = line.get(j);
+            }
+        }
+
+        // convert matrix to buttons
+        this.buttons = new ExtraKeyButton[matrix.length][];
+        for (int i = 0; i < matrix.length; i++) {
+            this.buttons[i] = new ExtraKeyButton[matrix[i].length];
+            for (int j = 0; j < matrix[i].length; j++) {
+                Object key = matrix[i][j];
+
+                JSONObject jobject = normalizeKeyConfig(key);
+
+                ExtraKeyButton button;
+
+                if (! jobject.has("popup")) {
+                    // no popup
+                    button = new ExtraKeyButton(getSelectedCharMap(), jobject);
+                } else {
+                    // a popup
+                    JSONObject popupJobject = normalizeKeyConfig(jobject.get("popup"));
+                    ExtraKeyButton popup = new ExtraKeyButton(getSelectedCharMap(), popupJobject);
+                    button = new ExtraKeyButton(getSelectedCharMap(), jobject, popup);
+                }
+
+                this.buttons[i][j] = button;
+            }
+        }
+    }
+
+    /**
+     * "hello" -> {"key": "hello"}
+     */
+    private static JSONObject normalizeKeyConfig(Object key) throws JSONException {
+        JSONObject jobject;
+        if (key instanceof String) {
+            jobject = new JSONObject();
+            jobject.put("key", key);
+        } else if (key instanceof JSONObject) {
+            jobject = (JSONObject) key;
+        } else {
+            throw new JSONException("An key in the extra-key matrix must be a string or an object");
+        }
+        return jobject;
+    }
+
+    public ExtraKeyButton[][] getMatrix() {
+        return buttons;
+    }
+
+    /**
+     * HashMap that implements Python dict.get(key, default) function.
+     * Default java.util .get(key) is then the same as .get(key, null);
+     */
+    static class CleverMap<K,V> extends HashMap<K,V> {
+        V get(K key, V defaultValue) {
+            if (containsKey(key))
+                return get(key);
+            else
+                return defaultValue;
+        }
+    }
+
+    static class CharDisplayMap extends CleverMap<String, String> {}
+
+    /**
+     * Keys are displayed in a natural looking way, like "→" for "RIGHT"
+     */
+    static final CharDisplayMap classicArrowsDisplay = new CharDisplayMap() {{
+        // classic arrow keys (for ◀ ▶ ▲ ▼ @see arrowVariationDisplay)
+        put("LEFT", "←"); // U+2190 ← LEFTWARDS ARROW
+        put("RIGHT", "→"); // U+2192 → RIGHTWARDS ARROW
+        put("UP", "↑"); // U+2191 ↑ UPWARDS ARROW
+        put("DOWN", "↓"); // U+2193 ↓ DOWNWARDS ARROW
+    }};
+
+    static final CharDisplayMap wellKnownCharactersDisplay = new CharDisplayMap() {{
+        // well known characters // https://en.wikipedia.org/wiki/{Enter_key, Tab_key, Delete_key}
+        put("ENTER", "↲"); // U+21B2 ↲ DOWNWARDS ARROW WITH TIP LEFTWARDS
+        put("TAB", "↹"); // U+21B9 ↹ LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
+        put("BKSP", "⌫"); // U+232B ⌫ ERASE TO THE LEFT sometimes seen and easy to understand
+        put("DEL", "⌦"); // U+2326 ⌦ ERASE TO THE RIGHT not well known but easy to understand
+        put("DRAWER", "☰"); // U+2630 ☰ TRIGRAM FOR HEAVEN not well known but easy to understand
+        put("KEYBOARD", "⌨"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
+    }};
+
+    static final CharDisplayMap lessKnownCharactersDisplay = new CharDisplayMap() {{
+        // https://en.wikipedia.org/wiki/{Home_key, End_key, Page_Up_and_Page_Down_keys}
+        // home key can mean "goto the beginning of line" or "goto first page" depending on context, hence the diagonal
+        put("HOME", "⇱"); // from IEC 9995 // U+21F1 ⇱ NORTH WEST ARROW TO CORNER
+        put("END", "⇲"); // from IEC 9995 // ⇲ // U+21F2 ⇲ SOUTH EAST ARROW TO CORNER
+        put("PGUP", "⇑"); // no ISO character exists, U+21D1 ⇑ UPWARDS DOUBLE ARROW will do the trick
+        put("PGDN", "⇓"); // no ISO character exists, U+21D3 ⇓ DOWNWARDS DOUBLE ARROW will do the trick
+    }};
+
+    static final CharDisplayMap arrowTriangleVariationDisplay = new CharDisplayMap() {{
+        // alternative to classic arrow keys
+        put("LEFT", "◀"); // U+25C0 ◀ BLACK LEFT-POINTING TRIANGLE
+        put("RIGHT", "▶"); // U+25B6 ▶ BLACK RIGHT-POINTING TRIANGLE
+        put("UP", "▲"); // U+25B2 ▲ BLACK UP-POINTING TRIANGLE
+        put("DOWN", "▼"); // U+25BC ▼ BLACK DOWN-POINTING TRIANGLE
+    }};
+
+    static final CharDisplayMap notKnownIsoCharacters = new CharDisplayMap() {{
+        // Control chars that are more clear as text // https://en.wikipedia.org/wiki/{Function_key, Alt_key, Control_key, Esc_key}
+        // put("FN", "FN"); // no ISO character exists
+        put("CTRL", "⎈"); // ISO character "U+2388 ⎈ HELM SYMBOL" is unknown to people and never printed on computers, however "U+25C7 ◇ WHITE DIAMOND" is a nice presentation, and "^" for terminal app and mac is often used
+        put("ALT", "⎇"); // ISO character "U+2387 ⎇ ALTERNATIVE KEY SYMBOL'" is unknown to people and only printed as the Option key "⌥" on Mac computer
+        put("ESC", "⎋"); // ISO character "U+238B ⎋ BROKEN CIRCLE WITH NORTHWEST ARROW" is unknown to people and not often printed on computers
+    }};
+
+    static final CharDisplayMap nicerLookingDisplay = new CharDisplayMap() {{
+        // nicer looking for most cases
+        put("-", "―"); // U+2015 ― HORIZONTAL BAR
+    }};
+
+    /*
+     * Multiple maps are available to quickly change
+     * the style of the keys.
+     */
+
+    /**
+     * Some classic symbols everybody knows
+     */
+    private static final CharDisplayMap defaultCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(nicerLookingDisplay);
+        // all other characters are displayed as themselves
+    }};
+
+    /**
+     * Classic symbols and less known symbols
+     */
+    private static final CharDisplayMap lotsOfArrowsCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(lessKnownCharactersDisplay); // NEW
+        putAll(nicerLookingDisplay);
+    }};
+
+    /**
+     * Only arrows
+     */
+    private static final CharDisplayMap arrowsOnlyCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        // putAll(wellKnownCharactersDisplay); // REMOVED
+        // putAll(lessKnownCharactersDisplay); // REMOVED
+        putAll(nicerLookingDisplay);
+    }};
+
+    /**
+     * Full Iso
+     */
+    private static final CharDisplayMap fullIsoCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(lessKnownCharactersDisplay); // NEW
+        putAll(nicerLookingDisplay);
+        putAll(notKnownIsoCharacters); // NEW
+    }};
+
+    /**
+     * Some people might call our keys differently
+     */
+    static private final CharDisplayMap controlCharsAliases = new CharDisplayMap() {{
+        put("ESCAPE", "ESC");
+        put("CONTROL", "CTRL");
+        put("RETURN", "ENTER"); // Technically different keys, but most applications won't see the difference
+        put("FUNCTION", "FN");
+        // no alias for ALT
+
+        // Directions are sometimes written as first and last letter for brevety
+        put("LT", "LEFT");
+        put("RT", "RIGHT");
+        put("DN", "DOWN");
+        // put("UP", "UP"); well, "UP" is already two letters
+
+        put("PAGEUP", "PGUP");
+        put("PAGE_UP", "PGUP");
+        put("PAGE UP", "PGUP");
+        put("PAGE-UP", "PGUP");
+
+        // no alias for HOME
+        // no alias for END
+
+        put("PAGEDOWN", "PGDN");
+        put("PAGE_DOWN", "PGDN");
+        put("PAGE-DOWN", "PGDN");
+
+        put("DELETE", "DEL");
+        put("BACKSPACE", "BKSP");
+
+        // easier for writing in termux.properties
+        put("BACKSLASH", "\\");
+        put("QUOTE", "\"");
+        put("APOSTROPHE", "'");
+    }};
+
+    CharDisplayMap getSelectedCharMap() {
+        switch (style) {
+            case "arrows-only":
+                return arrowsOnlyCharDisplay;
+            case "arrows-all":
+                return lotsOfArrowsCharDisplay;
+            case "all":
+                return fullIsoCharDisplay;
+            case "none":
+                return new CharDisplayMap();
+            default:
+                return defaultCharDisplay;
+        }
+    }
+
+    /**
+     * Applies the 'controlCharsAliases' mapping to all the strings in *buttons*
+     * Modifies the array, doesn't return a new one.
+     */
+    public static String replaceAlias(String key) {
+        return controlCharsAliases.get(key, key);
+    }
+}
+
@@ -0,0 +1,388 @@
+package com.termux.app.terminal.io.extrakeys;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+import android.util.AttributeSet;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ScheduledExecutorService;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import android.view.Gravity;
+import android.view.HapticFeedbackConstants;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.GridLayout;
+import android.widget.PopupWindow;
+
+import com.termux.R;
+import com.termux.app.terminal.TermuxTerminalViewClient;
+import com.termux.view.TerminalView;
+
+import androidx.drawerlayout.widget.DrawerLayout;
+
+/**
+ * A view showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
+ * keyboard.
+ */
+public final class ExtraKeysView extends GridLayout {
+
+    private static final int TEXT_COLOR = 0xFFFFFFFF;
+    private static final int BUTTON_COLOR = 0x00000000;
+    private static final int INTERESTING_COLOR = 0xFF80DEEA;
+    private static final int BUTTON_PRESSED_COLOR = 0xFF7F7F7F;
+
+    TermuxTerminalViewClient mTermuxTerminalViewClient;
+
+    public ExtraKeysView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    static final Map<String, Integer> keyCodesForString = new HashMap<String, Integer>() {{
+        put("SPACE", KeyEvent.KEYCODE_SPACE);
+        put("ESC", KeyEvent.KEYCODE_ESCAPE);
+        put("TAB", KeyEvent.KEYCODE_TAB);
+        put("HOME", KeyEvent.KEYCODE_MOVE_HOME);
+        put("END", KeyEvent.KEYCODE_MOVE_END);
+        put("PGUP", KeyEvent.KEYCODE_PAGE_UP);
+        put("PGDN", KeyEvent.KEYCODE_PAGE_DOWN);
+        put("INS", KeyEvent.KEYCODE_INSERT);
+        put("DEL", KeyEvent.KEYCODE_FORWARD_DEL);
+        put("BKSP", KeyEvent.KEYCODE_DEL);
+        put("UP", KeyEvent.KEYCODE_DPAD_UP);
+        put("LEFT", KeyEvent.KEYCODE_DPAD_LEFT);
+        put("RIGHT", KeyEvent.KEYCODE_DPAD_RIGHT);
+        put("DOWN", KeyEvent.KEYCODE_DPAD_DOWN);
+        put("ENTER", KeyEvent.KEYCODE_ENTER);
+        put("F1", KeyEvent.KEYCODE_F1);
+        put("F2", KeyEvent.KEYCODE_F2);
+        put("F3", KeyEvent.KEYCODE_F3);
+        put("F4", KeyEvent.KEYCODE_F4);
+        put("F5", KeyEvent.KEYCODE_F5);
+        put("F6", KeyEvent.KEYCODE_F6);
+        put("F7", KeyEvent.KEYCODE_F7);
+        put("F8", KeyEvent.KEYCODE_F8);
+        put("F9", KeyEvent.KEYCODE_F9);
+        put("F10", KeyEvent.KEYCODE_F10);
+        put("F11", KeyEvent.KEYCODE_F11);
+        put("F12", KeyEvent.KEYCODE_F12);
+    }};
+
+    @SuppressLint("RtlHardcoded")
+    private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean forceLeftAltDown) {
+        TerminalView terminalView = view.findViewById(R.id.terminal_view);
+        if ("KEYBOARD".equals(keyName)) {
+            if(mTermuxTerminalViewClient != null)
+                mTermuxTerminalViewClient.onToggleSoftKeyboardRequest();
+        } else if ("DRAWER".equals(keyName)) {
+            DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
+            drawer.openDrawer(Gravity.LEFT);
+        } else if (keyCodesForString.containsKey(keyName)) {
+            Integer keyCode = keyCodesForString.get(keyName);
+            if (keyCode == null) return;
+            int metaState = 0;
+            if (forceCtrlDown) {
+                metaState |= KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON;
+            }
+            if (forceLeftAltDown) {
+                metaState |= KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON;
+            }
+            KeyEvent keyEvent = new KeyEvent(0, 0, KeyEvent.ACTION_UP, keyCode, 0, metaState);
+            terminalView.onKeyDown(keyCode, keyEvent);
+        } else {
+            // not a control char
+            keyName.codePoints().forEach(codePoint -> {
+                terminalView.inputCodePoint(codePoint, forceCtrlDown, forceLeftAltDown);
+            });
+        }
+    }
+
+    private void sendKey(View view, ExtraKeyButton buttonInfo) {
+        if (buttonInfo.isMacro()) {
+            String[] keys = buttonInfo.getKey().split(" ");
+            boolean ctrlDown = false;
+            boolean altDown = false;
+            for (String key : keys) {
+                if ("CTRL".equals(key)) {
+                    ctrlDown = true;
+                } else if ("ALT".equals(key)) {
+                    altDown = true;
+                } else {
+                    sendKey(view, key, ctrlDown, altDown);
+                    ctrlDown = false;
+                    altDown = false;
+                }
+            }
+        } else {
+            sendKey(view, buttonInfo.getKey(), false, false);
+        }
+    }
+
+    public enum SpecialButton {
+        CTRL, ALT, FN
+    }
+
+    private static class SpecialButtonState {
+        boolean isOn = false;
+        boolean isActive = false;
+        List<Button> buttons = new ArrayList<>();
+
+        void setIsActive(boolean value) {
+            isActive = value;
+            buttons.forEach(button -> button.setTextColor(value ? INTERESTING_COLOR : TEXT_COLOR));
+        }
+    }
+
+    private final Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
+        put(SpecialButton.CTRL, new SpecialButtonState());
+        put(SpecialButton.ALT, new SpecialButtonState());
+        put(SpecialButton.FN, new SpecialButtonState());
+    }};
+
+    private final Set<String> specialButtonsKeys = specialButtons.keySet().stream().map(Enum::name).collect(Collectors.toSet());
+
+    private boolean isSpecialButton(ExtraKeyButton button) {
+        return specialButtonsKeys.contains(button.getKey());
+    }
+
+    private ScheduledExecutorService scheduledExecutor;
+    private PopupWindow popupWindow;
+    private int longPressCount;
+
+    public boolean readSpecialButton(SpecialButton name) {
+        SpecialButtonState state = specialButtons.get(name);
+        if (state == null)
+            throw new RuntimeException("Must be a valid special button (see source)");
+
+        if (!state.isOn || !state.isActive)
+            return false;
+
+        state.setIsActive(false);
+
+        return true;
+    }
+
+    private Button createSpecialButton(String buttonKey, boolean needUpdate) {
+        SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonKey));
+        if (state == null) return null;
+        state.isOn = true;
+        Button button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+        button.setTextColor(state.isActive ? INTERESTING_COLOR : TEXT_COLOR);
+        if (needUpdate) {
+            state.buttons.add(button);
+        }
+        return button;
+    }
+
+    void popup(View view, ExtraKeyButton extraButton) {
+        int width = view.getMeasuredWidth();
+        int height = view.getMeasuredHeight();
+        Button button;
+        if (isSpecialButton(extraButton)) {
+            button = createSpecialButton(extraButton.getKey(), false);
+            if (button == null) return;
+        } else {
+            button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+            button.setTextColor(TEXT_COLOR);
+        }
+        button.setText(extraButton.getDisplay());
+        button.setPadding(0, 0, 0, 0);
+        button.setMinHeight(0);
+        button.setMinWidth(0);
+        button.setMinimumWidth(0);
+        button.setMinimumHeight(0);
+        button.setWidth(width);
+        button.setHeight(height);
+        button.setBackgroundColor(BUTTON_PRESSED_COLOR);
+        popupWindow = new PopupWindow(this);
+        popupWindow.setWidth(LayoutParams.WRAP_CONTENT);
+        popupWindow.setHeight(LayoutParams.WRAP_CONTENT);
+        popupWindow.setContentView(button);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setFocusable(false);
+        popupWindow.showAsDropDown(view, 0, -2 * height);
+    }
+
+    /**
+     * General util function to compute the longest column length in a matrix.
+     */
+    static int maximumLength(Object[][] matrix) {
+        int m = 0;
+        for (Object[] row : matrix)
+            m = Math.max(m, row.length);
+        return m;
+    }
+
+    /**
+     * Reload the view given parameters in termux.properties
+     *
+     * @param infos matrix as defined in termux.properties extrakeys
+     * Can Contain The Strings CTRL ALT TAB FN ENTER LEFT RIGHT UP DOWN or normal strings
+     * Some aliases are possible like RETURN for ENTER, LT for LEFT and more (@see controlCharsAliases for the whole list).
+     * Any string of length > 1 in total Uppercase will print a warning
+     *
+     * Examples:
+     * "ENTER" will trigger the ENTER keycode
+     * "LEFT" will trigger the LEFT keycode and be displayed as "←"
+     * "→" will input a "→" character
+     * "−" will input a "−" character
+     * "-_-" will input the string "-_-"
+     */
+    @SuppressLint("ClickableViewAccessibility")
+    public void reload(ExtraKeysInfo infos) {
+        if (infos == null)
+            return;
+
+        for(SpecialButtonState state : specialButtons.values())
+            state.buttons = new ArrayList<>();
+
+        removeAllViews();
+
+        ExtraKeyButton[][] buttons = infos.getMatrix();
+
+        setRowCount(buttons.length);
+        setColumnCount(maximumLength(buttons));
+
+        for (int row = 0; row < buttons.length; row++) {
+            for (int col = 0; col < buttons[row].length; col++) {
+                final ExtraKeyButton buttonInfo = buttons[row][col];
+
+                Button button;
+                if (isSpecialButton(buttonInfo)) {
+                    button = createSpecialButton(buttonInfo.getKey(), true);
+                    if (button == null) return;
+                } else {
+                    button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                }
+
+                button.setText(buttonInfo.getDisplay());
+                button.setTextColor(TEXT_COLOR);
+                button.setPadding(0, 0, 0, 0);
+
+                final Button finalButton = button;
+                button.setOnClickListener(v -> {
+                    if (Settings.System.getInt(getContext().getContentResolver(),
+                        Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0) {
+
+                        if (Build.VERSION.SDK_INT >= 28) {
+                            finalButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                        } else {
+                            // Perform haptic feedback only if no total silence mode enabled.
+                            if (Settings.Global.getInt(getContext().getContentResolver(), "zen_mode", 0) != 2) {
+                                finalButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                            }
+                        }
+                    }
+
+                    View root = getRootView();
+                    if (isSpecialButton(buttonInfo)) {
+                        SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey()));
+                        if (state == null) return;
+                        state.setIsActive(!state.isActive);
+                    } else {
+                        sendKey(root, buttonInfo);
+                    }
+                });
+
+                button.setOnTouchListener((v, event) -> {
+                    final View root = getRootView();
+                    switch (event.getAction()) {
+                        case MotionEvent.ACTION_DOWN:
+                            longPressCount = 0;
+                            v.setBackgroundColor(BUTTON_PRESSED_COLOR);
+                            if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL").contains(buttonInfo.getKey())) {
+                                // autorepeat
+                                scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+                                scheduledExecutor.scheduleWithFixedDelay(() -> {
+                                    longPressCount++;
+                                    sendKey(root, buttonInfo);
+                                }, 400, 80, TimeUnit.MILLISECONDS);
+                            }
+                            return true;
+
+                        case MotionEvent.ACTION_MOVE:
+                            if (buttonInfo.getPopup() != null) {
+                                if (popupWindow == null && event.getY() < 0) {
+                                    if (scheduledExecutor != null) {
+                                        scheduledExecutor.shutdownNow();
+                                        scheduledExecutor = null;
+                                    }
+                                    v.setBackgroundColor(BUTTON_COLOR);
+                                    popup(v, buttonInfo.getPopup());
+                                }
+                                if (popupWindow != null && event.getY() > 0) {
+                                    v.setBackgroundColor(BUTTON_PRESSED_COLOR);
+                                    popupWindow.dismiss();
+                                    popupWindow = null;
+                                }
+                            }
+                            return true;
+
+                        case MotionEvent.ACTION_CANCEL:
+                            v.setBackgroundColor(BUTTON_COLOR);
+                            if (scheduledExecutor != null) {
+                                scheduledExecutor.shutdownNow();
+                                scheduledExecutor = null;
+                            }
+                            return true;
+                        case MotionEvent.ACTION_UP:
+                            v.setBackgroundColor(BUTTON_COLOR);
+                            if (scheduledExecutor != null) {
+                                scheduledExecutor.shutdownNow();
+                                scheduledExecutor = null;
+                            }
+                            if (longPressCount == 0 || popupWindow != null) {
+                                if (popupWindow != null) {
+                                    popupWindow.setContentView(null);
+                                    popupWindow.dismiss();
+                                    popupWindow = null;
+                                    if (buttonInfo.getPopup() != null) {
+                                        if (isSpecialButton(buttonInfo.getPopup())) {
+                                            SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getPopup().getKey()));
+                                            if (state == null) return true;
+                                            state.setIsActive(!state.isActive);
+                                        } else {
+                                            sendKey(root, buttonInfo.getPopup());
+                                        }
+                                    }
+                                } else {
+                                    v.performClick();
+                                }
+                            }
+                            return true;
+
+                        default:
+                            return true;
+                    }
+                });
+
+                LayoutParams param = new GridLayout.LayoutParams();
+                param.width = 0;
+                param.height = 0;
+                param.setMargins(0, 0, 0, 0);
+                param.columnSpec = GridLayout.spec(col, GridLayout.FILL, 1.f);
+                param.rowSpec = GridLayout.spec(row, GridLayout.FILL, 1.f);
+                button.setLayoutParams(param);
+
+                addView(button);
+            }
+        }
+    }
+
+    public void setTermuxTerminalViewClient(TermuxTerminalViewClient termuxTerminalViewClient) {
+        this.mTermuxTerminalViewClient = termuxTerminalViewClient;
+    }
+
+}
@@ -4,23 +4,20 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.os.Environment;
+import android.content.Intent;

 import androidx.annotation.Nullable;

 import com.termux.R;
-import com.termux.shared.activities.ReportActivity;
-import com.termux.shared.models.errors.Error;
+import com.termux.app.activities.ReportActivity;
 import com.termux.shared.notification.NotificationUtils;
 import com.termux.shared.file.FileUtils;
-import com.termux.shared.models.ReportInfo;
+import com.termux.app.models.ReportInfo;
 import com.termux.app.models.UserAction;
-import com.termux.shared.notification.TermuxNotificationUtils;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxUtils;

 import com.termux.shared.termux.TermuxConstants;
@@ -32,8 +29,8 @@ public class CrashUtils {
    private static final String LOG_TAG = "CrashUtils";

    /**
-     * Notify the user of an app crash at last run by reading the crash info from the crash log file
-     * at {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}. The crash log file would have been
+     * Notify the user of a previous app crash by reading the crash info from the crash log file at
+     * {@link TermuxConstants#TERMUX_CRASH_LOG_FILE_PATH}. The crash log file would have been
     * created by {@link com.termux.shared.crash.CrashHandler}.
     *
     * If the crash log file exists and is not empty and
@@ -46,14 +43,13 @@ public class CrashUtils {
     * @param context The {@link Context} for operations.
     * @param logTagParam The log tag to use for logging.
     */
-    public static void notifyAppCrashOnLastRun(final Context context, final String logTagParam) {
+    public static void notifyCrash(final Context context, final String logTagParam) {
        if (context == null) return;

-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-        if (preferences == null) return;

+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
        // If user has disabled notifications for crashes
-        if (!preferences.areCrashReportNotificationsEnabled())
+        if (!preferences.getCrashReportNotificationsEnabled())
            return;

        new Thread() {
@@ -64,105 +60,52 @@ public class CrashUtils {
                if (!FileUtils.regularFileExists(TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, false))
                    return;

-                Error error;
+                String errmsg;
                StringBuilder reportStringBuilder = new StringBuilder();

                // Read report string from crash log file
-                error = FileUtils.readStringFromFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
-                if (error != null) {
-                    Logger.logErrorExtended(logTag, error.toString());
+                errmsg = FileUtils.readStringFromFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, Charset.defaultCharset(), reportStringBuilder, false);
+                if (errmsg != null) {
+                    Logger.logError(logTag, errmsg);
                    return;
                }

                // Move crash log file to backup location if it exists
-                error = FileUtils.moveRegularFile("crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, TermuxConstants.TERMUX_CRASH_LOG_BACKUP_FILE_PATH, true);
-                if (error != null) {
-                    Logger.logErrorExtended(logTag, error.toString());
+                FileUtils.moveRegularFile(context, "crash log", TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH, TermuxConstants.TERMUX_CRASH_LOG_BACKUP_FILE_PATH, true);
+                if (errmsg != null) {
+                    Logger.logError(logTag, errmsg);
                }

                String reportString = reportStringBuilder.toString();

-                if (reportString.isEmpty())
+                if (reportString == null || reportString.isEmpty())
                    return;

-                Logger.logDebug(logTag, "A crash log file found at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\".");
+                // Send a notification to show the crash log which when clicked will open the {@link ReportActivity}
+                // to show the details of the crash
+                String title = TermuxConstants.TERMUX_APP_NAME + " Crash Report";

-                sendCrashReportNotification(context, logTag, reportString, false, false);
+                Logger.logDebug(logTag, "The crash log file at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH +  "\" found. Sending \"" + title + "\" notification.");
+
+                Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT, logTag, title, null, reportString, "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true));
+                PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+                // Setup the notification channel if not already set up
+                setupCrashReportsNotificationChannel(context);
+
+                // Build the notification
+                Notification.Builder builder = getCrashReportsNotificationBuilder(context, title, null, null, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+                if (builder == null)  return;
+
+                // Send the notification
+                int nextNotificationId = NotificationUtils.getNextNotificationId(context);
+                NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
+                if (notificationManager != null)
+                    notificationManager.notify(nextNotificationId, builder.build());
            }
        }.start();
    }

-    /**
-     * Send a crash report notification for {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID}
-     * and {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME}.
-     *
-     * @param context The {@link Context} for operations.
-     * @param logTag The log tag to use for logging.
-     * @param message The message for the crash report.
-     * @param forceNotification If set to {@code true}, then a notification will be shown
-     *                          regardless of if pending intent is {@code null} or
-     *                          {@link TermuxPreferenceConstants.TERMUX_APP#KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED}
-     *                          is {@code false}.
-     * @param addAppAndDeviceInfo If set to {@code true}, then app and device info will be appended
-     *                            to the message.
-     */
-    public static void sendCrashReportNotification(final Context context, String logTag, String message, boolean forceNotification, boolean addAppAndDeviceInfo) {
-        if (context == null) return;
-
-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-        if (preferences == null) return;
-
-        // If user has disabled notifications for crashes
-        if (!preferences.areCrashReportNotificationsEnabled() && !forceNotification)
-            return;
-
-        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
-
-        // Send a notification to show the crash log which when clicked will open the {@link ReportActivity}
-        // to show the details of the crash
-        String title = TermuxConstants.TERMUX_APP_NAME + " Crash Report";
-
-        Logger.logDebug(logTag, "Sending \"" + title + "\" notification.");
-
-        StringBuilder reportString = new StringBuilder(message);
-
-        if (addAppAndDeviceInfo) {
-            reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
-            reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
-        }
-
-        String userActionName = UserAction.CRASH_REPORT.getName();
-        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context, new ReportInfo(userActionName,
-            logTag, title, null, reportString.toString(),
-            "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true,
-            userActionName,
-            Environment.getExternalStorageDirectory() + "/" +
-                FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
-        if (result.contentIntent == null) return;
-
-        // Must ensure result code for PendingIntents and id for notification are unique otherwise will override previous
-        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(context);
-
-        PendingIntent contentIntent = PendingIntent.getActivity(context, nextNotificationId, result.contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        PendingIntent deleteIntent = null;
-        if (result.deleteIntent != null)
-            deleteIntent = PendingIntent.getBroadcast(context, nextNotificationId, result.deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        // Setup the notification channel if not already set up
-        setupCrashReportsNotificationChannel(context);
-
-        // Build the notification
-        Notification.Builder builder = getCrashReportsNotificationBuilder(context, title, null,
-            null, contentIntent, deleteIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
-        if (builder == null) return;
-
-        // Send the notification
-        NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
-        if (notificationManager != null)
-            notificationManager.notify(nextNotificationId, builder.build());
-    }
-
    /**
     * Get {@link Notification.Builder} for {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID}
     * and {@link TermuxConstants#TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_NAME}.
@@ -171,17 +114,16 @@ public class CrashUtils {
     * @param title The title for the notification.
     * @param notificationText The second line text of the notification.
     * @param notificationBigText The full text of the notification that may optionally be styled.
-     * @param contentIntent The {@link PendingIntent} which should be sent when notification is clicked.
-     * @param deleteIntent The {@link PendingIntent} which should be sent when notification is deleted.
+     * @param pendingIntent The {@link PendingIntent} which should be sent when notification is clicked.
     * @param notificationMode The notification mode. It must be one of {@code NotificationUtils.NOTIFICATION_MODE_*}.
     * @return Returns the {@link Notification.Builder}.
     */
    @Nullable
-    public static Notification.Builder getCrashReportsNotificationBuilder(final Context context, final CharSequence title, final CharSequence notificationText, final CharSequence notificationBigText, final PendingIntent contentIntent, final PendingIntent deleteIntent, final int notificationMode) {
+    public static Notification.Builder getCrashReportsNotificationBuilder(final Context context, final CharSequence title, final CharSequence notificationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {

        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
            TermuxConstants.TERMUX_CRASH_REPORTS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
-            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
+            title, notificationText, notificationBigText, pendingIntent, notificationMode);

        if (builder == null)  return null;

@@ -1,34 +1,26 @@
 package com.termux.app.utils;

+import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.os.Environment;
+import android.content.Intent;
+import android.os.Bundle;

 import androidx.annotation.Nullable;

 import com.termux.R;
-import com.termux.shared.activities.ReportActivity;
-import com.termux.shared.file.FileUtils;
-import com.termux.shared.file.TermuxFileUtils;
-import com.termux.shared.models.ResultConfig;
-import com.termux.shared.models.ResultData;
-import com.termux.shared.models.errors.Errno;
-import com.termux.shared.models.errors.Error;
 import com.termux.shared.notification.NotificationUtils;
-import com.termux.shared.notification.TermuxNotificationUtils;
-import com.termux.shared.shell.ResultSender;
-import com.termux.shared.shell.ShellUtils;
-import com.termux.shared.termux.AndroidUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
+import com.termux.app.activities.ReportActivity;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
 import com.termux.shared.settings.properties.SharedProperties;
 import com.termux.shared.settings.properties.TermuxPropertyConstants;
-import com.termux.shared.models.ReportInfo;
+import com.termux.app.models.ReportInfo;
 import com.termux.shared.models.ExecutionCommand;
 import com.termux.app.models.UserAction;
 import com.termux.shared.data.DataUtils;
@@ -37,6 +29,12 @@ import com.termux.shared.termux.TermuxUtils;

 public class PluginUtils {

+    /** Required file permissions for the executable file of execute intent. Executable file must have read and execute permissions */
+    public static final String PLUGIN_EXECUTABLE_FILE_PERMISSIONS = "r-x"; // Default: "r-x"
+    /** Required file permissions for the working directory of execute intent. Working directory must have read and write permissions.
+     * Execute permissions should be attempted to be set, but ignored if they are missing */
+    public static final String PLUGIN_WORKING_DIRECTORY_PERMISSIONS = "rwx"; // Default: "rwx"
+
    private static final String LOG_TAG = "PluginUtils";

    /**
@@ -45,8 +43,8 @@ public class PluginUtils {
     * The ExecutionCommand currentState must be greater or equal to
     * {@link ExecutionCommand.ExecutionState#EXECUTED}.
     * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and
-     * {@link ResultConfig#resultPendingIntent} or {@link ResultConfig#resultDirectoryPath}
-     * is not {@code null}, then the result of commands are sent back to the command caller.
+     * {@link ExecutionCommand#pluginPendingIntent} is not {@code null}, then the result of commands
+     * are sent back to the {@link PendingIntent} creator.
     *
     * @param context The {@link Context} that will be used to send result intent to the {@link PendingIntent} creator.
     * @param logTag The log tag to use for logging.
@@ -56,46 +54,31 @@ public class PluginUtils {
        if (executionCommand == null) return;

        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
-        Error error = null;
-        ResultData resultData = executionCommand.resultData;

        if (!executionCommand.hasExecuted()) {
-            Logger.logWarn(logTag, executionCommand.getCommandIdAndLabelLogString() + ": Ignoring call to processPluginExecutionCommandResult() since the execution command state is not higher than the ExecutionState.EXECUTED");
+            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandResult() since the execution command state is not higher than the ExecutionState.EXECUTED");
            return;
        }

-        boolean isPluginExecutionCommandWithPendingResult = executionCommand.isPluginExecutionCommandWithPendingResult();
-        boolean isExecutionCommandLoggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel);
+        Logger.logDebug(LOG_TAG, executionCommand.toString());

-        // Log the output. ResultData should not be logged if pending result since ResultSender will do it
-        // or if logging is disabled
-        Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true,
-            !isPluginExecutionCommandWithPendingResult, isExecutionCommandLoggingEnabled));
+        boolean result = true;

-        // If execution command was started by a plugin which expects the result back
-        if (isPluginExecutionCommandWithPendingResult) {
-            // Set variables which will be used by sendCommandResultData to send back the result
-            if (executionCommand.resultConfig.resultPendingIntent != null)
-                setPluginResultPendingIntentVariables(executionCommand);
-            if (executionCommand.resultConfig.resultDirectoryPath != null)
-                setPluginResultDirectoryVariables(executionCommand);
+        // If isPluginExecutionCommand is true and pluginPendingIntent is not null, then
+        // send pluginPendingIntent to its creator with the result
+        if (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null) {
+            String errmsg = executionCommand.errmsg;

-            // Send result to caller
-            error = ResultSender.sendCommandResultData(context, logTag, executionCommand.getCommandIdAndLabelLogString(),
-                executionCommand.resultConfig, executionCommand.resultData, isExecutionCommandLoggingEnabled);
-            if (error != null) {
-                // error will be added to existing Errors
-                resultData.setStateFailed(error);
-                Logger.logDebugExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true, isExecutionCommandLoggingEnabled));
-
-                // Flash and send notification for the error
-                Logger.showToast(context, ResultData.getErrorsListMinimalString(resultData), true);
-                sendPluginCommandErrorNotification(context, logTag, executionCommand, ResultData.getErrorsListMinimalString(resultData));
+            //Combine errmsg and stacktraces
+            if (executionCommand.isStateFailed()) {
+                errmsg = Logger.getMessageAndStackTracesString(executionCommand.errmsg, executionCommand.throwableList);
            }

+            // Send pluginPendingIntent to its creator
+            result = sendPluginExecutionCommandResultPendingIntent(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.stdout, executionCommand.stderr, executionCommand.exitCode, executionCommand.errCode, errmsg, executionCommand.pluginPendingIntent);
        }

-        if (!executionCommand.isStateFailed() && error == null)
+        if (!executionCommand.isStateFailed() && result)
            executionCommand.setState(ExecutionCommand.ExecutionState.SUCCESS);
    }

@@ -103,13 +86,14 @@ public class PluginUtils {
     * Process {@link ExecutionCommand} error.
     *
     * The ExecutionCommand currentState must be equal to {@link ExecutionCommand.ExecutionState#FAILED}.
-     * The {@link ResultData#getErrCode()} must have been set to a value greater than
-     * {@link Errno#ERRNO_SUCCESS}.
-     * The {@link ResultData#errorsList} must also be set with appropriate error info.
+     * The {@link ExecutionCommand#errCode} must have been set to a value greater than
+     * {@link ExecutionCommand#RESULT_CODE_OK}.
+     * The {@link ExecutionCommand#errmsg} and any {@link ExecutionCommand#throwableList} must also
+     * be set with appropriate error info.
     *
     * If the {@link ExecutionCommand#isPluginExecutionCommand} is {@code true} and
-     * {@link ResultConfig#resultPendingIntent} or {@link ResultConfig#resultDirectoryPath}
-     * is not {@code null}, then the errors of commands are sent back to the command caller.
+     * {@link ExecutionCommand#pluginPendingIntent} is not {@code null}, then the errors of commands
+     * are sent back to the {@link PendingIntent} creator.
     *
     * Otherwise if the {@link TERMUX_APP#KEY_PLUGIN_ERROR_NOTIFICATIONS_ENABLED} is
     * enabled, then a flash and a notification will be shown for the error as well
@@ -128,96 +112,42 @@ public class PluginUtils {
        if (context == null || executionCommand == null) return;

        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
-        Error error;
-        ResultData resultData = executionCommand.resultData;

        if (!executionCommand.isStateFailed()) {
-            Logger.logWarn(logTag, executionCommand.getCommandIdAndLabelLogString() + ": Ignoring call to processPluginExecutionCommandError() since the execution command is not in ExecutionState.FAILED");
+            Logger.logWarn(logTag, "Ignoring call to processPluginExecutionCommandError() since the execution command is not in ExecutionState.FAILED");
            return;
        }

-        boolean isPluginExecutionCommandWithPendingResult = executionCommand.isPluginExecutionCommandWithPendingResult();
-        boolean isExecutionCommandLoggingEnabled = Logger.shouldEnableLoggingForCustomLogLevel(executionCommand.backgroundCustomLogLevel);
+        // Log the error and any exception
+        Logger.logStackTracesWithMessage(logTag, "(" + executionCommand.errCode + ") " + executionCommand.errmsg, executionCommand.throwableList);

-        // Log the error and any exception. ResultData should not be logged if pending result since ResultSender will do it
-        Logger.logErrorExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true,
-            !isPluginExecutionCommandWithPendingResult, isExecutionCommandLoggingEnabled));

-        // If execution command was started by a plugin which expects the result back
-        if (isPluginExecutionCommandWithPendingResult) {
-            // Set variables which will be used by sendCommandResultData to send back the result
-            if (executionCommand.resultConfig.resultPendingIntent != null)
-                setPluginResultPendingIntentVariables(executionCommand);
-            if (executionCommand.resultConfig.resultDirectoryPath != null)
-                setPluginResultDirectoryVariables(executionCommand);
+        // If isPluginExecutionCommand is true and pluginPendingIntent is not null, then
+        // send pluginPendingIntent to its creator with the errors
+        if (executionCommand.isPluginExecutionCommand && executionCommand.pluginPendingIntent != null) {
+            String errmsg = executionCommand.errmsg;

-            // Send result to caller
-            error = ResultSender.sendCommandResultData(context, logTag, executionCommand.getCommandIdAndLabelLogString(),
-                executionCommand.resultConfig, executionCommand.resultData, isExecutionCommandLoggingEnabled);
-            if (error != null) {
-                // error will be added to existing Errors
-                resultData.setStateFailed(error);
-                Logger.logErrorExtended(logTag, ExecutionCommand.getExecutionOutputLogString(executionCommand, true, true, isExecutionCommandLoggingEnabled));
-                forceNotification = true;
+            //Combine errmsg and stacktraces
+            if (executionCommand.isStateFailed()) {
+                errmsg = Logger.getMessageAndStackTracesString(executionCommand.errmsg, executionCommand.throwableList);
            }

+            sendPluginExecutionCommandResultPendingIntent(context, logTag, executionCommand.getCommandIdAndLabelLogString(), executionCommand.stdout, executionCommand.stderr, executionCommand.exitCode, executionCommand.errCode, errmsg, executionCommand.pluginPendingIntent);
+
            // No need to show notifications if a pending intent was sent, let the caller handle the result himself
            if (!forceNotification) return;
        }

-        TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-        if (preferences == null) return;

-        // If user has disabled notifications for plugin commands, then just return
-        if (!preferences.arePluginErrorNotificationsEnabled() && !forceNotification)
+        TermuxAppSharedPreferences preferences = new TermuxAppSharedPreferences(context);
+        // If user has disabled notifications for plugin, then just return
+        if (!preferences.getPluginErrorNotificationsEnabled() && !forceNotification)
            return;

-        // Flash and send notification for the error
-        Logger.showToast(context, ResultData.getErrorsListMinimalString(resultData), true);
-        sendPluginCommandErrorNotification(context, logTag, executionCommand, ResultData.getErrorsListMinimalString(resultData));
+        // Flash the errmsg
+        Logger.showToast(context, executionCommand.errmsg, true);

-    }
-
-    /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData, boolean)}
-     * to send back the result via {@link ResultConfig#resultPendingIntent}. */
-    public static void setPluginResultPendingIntentVariables(ExecutionCommand executionCommand) {
-        ResultConfig resultConfig = executionCommand.resultConfig;
-
-        resultConfig.resultBundleKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE;
-        resultConfig.resultStdoutKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT;
-        resultConfig.resultStdoutOriginalLengthKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH;
-        resultConfig.resultStderrKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR;
-        resultConfig.resultStderrOriginalLengthKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH;
-        resultConfig.resultExitCodeKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE;
-        resultConfig.resultErrCodeKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR;
-        resultConfig.resultErrmsgKey = TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG;
-    }
-
-    /** Set variables which will be used by {@link ResultSender#sendCommandResultData(Context, String, String, ResultConfig, ResultData, boolean)}
-     * to send back the result by writing it to files in {@link ResultConfig#resultDirectoryPath}. */
-    public static void setPluginResultDirectoryVariables(ExecutionCommand executionCommand) {
-        ResultConfig resultConfig = executionCommand.resultConfig;
-
-        resultConfig.resultDirectoryPath = TermuxFileUtils.getCanonicalPath(resultConfig.resultDirectoryPath, null, true);
-        resultConfig.resultDirectoryAllowedParentPath = TermuxFileUtils.getMatchedAllowedTermuxWorkingDirectoryParentPathForPath(resultConfig.resultDirectoryPath);
-
-        // Set default resultFileBasename if resultSingleFile is true to `<executable_basename>-<timestamp>.log`
-        if (resultConfig.resultSingleFile && resultConfig.resultFileBasename == null)
-            resultConfig.resultFileBasename = ShellUtils.getExecutableBasename(executionCommand.executable) + "-" + AndroidUtils.getCurrentMilliSecondLocalTimeStamp() + ".log";
-    }
-
-
-
-    /**
-     * Send an error notification for {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
-     * and {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME}.
-     *
-     * @param context The {@link Context} for operations.
-     * @param executionCommand The {@link ExecutionCommand} that failed.
-     * @param notificationTextString The text of the notification.
-     */
-    public static void sendPluginCommandErrorNotification(Context context, String logTag, ExecutionCommand executionCommand, String notificationTextString) {
-        // Send a notification to show the error which when clicked will open the ReportActivity
+        // Send a notification to show the errmsg which when clicked will open the {@link ReportActivity}
        // to show the details of the error
        String title = TermuxConstants.TERMUX_APP_NAME + " Plugin Execution Command Error";

@@ -225,44 +155,114 @@ public class PluginUtils {

        reportString.append(ExecutionCommand.getExecutionCommandMarkdownString(executionCommand));
        reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true));
-        reportString.append("\n\n").append(AndroidUtils.getDeviceInfoMarkdownString(context));
+        reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));

-        String userActionName = UserAction.PLUGIN_EXECUTION_COMMAND.getName();
-        ReportActivity.NewInstanceResult result = ReportActivity.newInstance(context,
-            new ReportInfo(userActionName, logTag, title, null,
-                reportString.toString(), null,true,
-                userActionName,
-                Environment.getExternalStorageDirectory() + "/" +
-                    FileUtils.sanitizeFileName(TermuxConstants.TERMUX_APP_NAME + "-" + userActionName + ".log", true, true)));
-        if (result.contentIntent == null) return;
-
-        // Must ensure result code for PendingIntents and id for notification are unique otherwise will override previous
-        int nextNotificationId = TermuxNotificationUtils.getNextNotificationId(context);
-
-        PendingIntent contentIntent = PendingIntent.getActivity(context, nextNotificationId, result.contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        PendingIntent deleteIntent = null;
-        if (result.deleteIntent != null)
-            deleteIntent = PendingIntent.getBroadcast(context, nextNotificationId, result.deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, null, reportString.toString(), null,true));
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);

        // Setup the notification channel if not already set up
        setupPluginCommandErrorsNotificationChannel(context);

        // Use markdown in notification
-        CharSequence notificationTextCharSequence = MarkdownUtils.getSpannedMarkdownText(context, notificationTextString);
-        //CharSequence notificationTextCharSequence = notificationTextString;
+        CharSequence notificationText = MarkdownUtils.getSpannedMarkdownText(context, executionCommand.errmsg);
+        //CharSequence notificationText = executionCommand.errmsg;

        // Build the notification
-        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title,
-            notificationTextCharSequence, notificationTextCharSequence, contentIntent, deleteIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
-        if (builder == null) return;
+        Notification.Builder builder = getPluginCommandErrorsNotificationBuilder(context, title, notificationText, notificationText, pendingIntent, NotificationUtils.NOTIFICATION_MODE_VIBRATE);
+        if (builder == null)  return;

        // Send the notification
+        int nextNotificationId = NotificationUtils.getNextNotificationId(context);
        NotificationManager notificationManager = NotificationUtils.getNotificationManager(context);
        if (notificationManager != null)
            notificationManager.notify(nextNotificationId, builder.build());
+
    }

+    /**
+     * Send {@link ExecutionCommand} result {@link PendingIntent} in the
+     * {@link TERMUX_SERVICE#EXTRA_PLUGIN_RESULT_BUNDLE} bundle.
+     *
+     *
+     * @param context The {@link Context} that will be used to send result intent to the {@link PendingIntent} creator.
+     * @param logTag The log tag to use for logging.
+     * @param label The label of {@link ExecutionCommand}.
+     * @param stdout The stdout of {@link ExecutionCommand}.
+     * @param stderr The stderr of {@link ExecutionCommand}.
+     * @param exitCode The exitCode of {@link ExecutionCommand}.
+     * @param errCode The errCode of {@link ExecutionCommand}.
+     * @param errmsg The errmsg of {@link ExecutionCommand}.
+     * @param pluginPendingIntent The pluginPendingIntent of {@link ExecutionCommand}.
+     * @return Returns {@code true} if pluginPendingIntent was successfully send, otherwise [@code false}.
+     */
+    public static boolean sendPluginExecutionCommandResultPendingIntent(Context context, String logTag, String label, String stdout, String stderr, Integer exitCode, Integer errCode, String errmsg, PendingIntent pluginPendingIntent) {
+        if (context == null || pluginPendingIntent == null) return false;
+
+        logTag = DataUtils.getDefaultIfNull(logTag, LOG_TAG);
+
+        Logger.logDebug(logTag,  "Sending execution result for Execution Command \"" + label +  "\" to " + pluginPendingIntent.getCreatorPackage());
+
+        String truncatedStdout = null;
+        String truncatedStderr = null;
+
+        String stdoutOriginalLength = (stdout == null) ? null: String.valueOf(stdout.length());
+        String stderrOriginalLength = (stderr == null) ? null: String.valueOf(stderr.length());
+
+        // Truncate stdout and stdout to max TRANSACTION_SIZE_LIMIT_IN_BYTES
+        if (stderr == null || stderr.isEmpty()) {
+            truncatedStdout = DataUtils.getTruncatedCommandOutput(stdout, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else if (stdout == null || stdout.isEmpty()) {
+            truncatedStderr = DataUtils.getTruncatedCommandOutput(stderr, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, false, false);
+        } else {
+            truncatedStdout = DataUtils.getTruncatedCommandOutput(stdout, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+            truncatedStderr = DataUtils.getTruncatedCommandOutput(stderr, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 2, false, false, false);
+        }
+
+        if (truncatedStdout != null && truncatedStdout.length() < stdout.length()) {
+            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + label +  "\" stdout length truncated from " + stdoutOriginalLength + " to " + truncatedStdout.length());
+            stdout = truncatedStdout;
+        }
+
+        if (truncatedStderr != null && truncatedStderr.length() < stderr.length()) {
+            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + label +  "\" stderr length truncated from " + stderrOriginalLength + " to " + truncatedStderr.length());
+            stderr = truncatedStderr;
+        }
+
+        String errmsgOriginalLength = (errmsg == null) ? null: String.valueOf(errmsg.length());
+
+        // Truncate errmsg to max TRANSACTION_SIZE_LIMIT_IN_BYTES / 4
+        // trim from end to preserve start of stacktraces
+        String truncatedErrmsg = DataUtils.getTruncatedCommandOutput(errmsg, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES / 4, true, false, false);
+        if (truncatedErrmsg != null && truncatedErrmsg.length() < errmsg.length()) {
+            Logger.logWarn(logTag, "Execution Result for Execution Command \"" + label +  "\" errmsg length truncated from " + errmsgOriginalLength + " to " + truncatedErrmsg.length());
+            errmsg = truncatedErrmsg;
+        }
+
+
+        final Bundle resultBundle = new Bundle();
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT, stdout);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDOUT_ORIGINAL_LENGTH, stdoutOriginalLength);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR, stderr);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_STDERR_ORIGINAL_LENGTH, stderrOriginalLength);
+        if (exitCode != null) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_EXIT_CODE, exitCode);
+        if (errCode != null) resultBundle.putInt(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERR, errCode);
+        resultBundle.putString(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE_ERRMSG, errmsg);
+
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra(TERMUX_SERVICE.EXTRA_PLUGIN_RESULT_BUNDLE, resultBundle);
+
+        try {
+            pluginPendingIntent.send(context, Activity.RESULT_OK, resultIntent);
+        } catch (PendingIntent.CanceledException e) {
+            // The caller doesn't want the result? That's fine, just ignore
+            Logger.logDebug(logTag,  "The Execution Command \"" + label +  "\" creator " + pluginPendingIntent.getCreatorPackage() + " does not want the results anymore");
+        }
+
+        return true;
+    }
+
+
+
    /**
     * Get {@link Notification.Builder} for {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID}
     * and {@link TermuxConstants#TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_NAME}.
@@ -271,19 +271,16 @@ public class PluginUtils {
     * @param title The title for the notification.
     * @param notificationText The second line text of the notification.
     * @param notificationBigText The full text of the notification that may optionally be styled.
-     * @param contentIntent The {@link PendingIntent} which should be sent when notification is clicked.
-     * @param deleteIntent The {@link PendingIntent} which should be sent when notification is deleted.
+     * @param pendingIntent The {@link PendingIntent} which should be sent when notification is clicked.
     * @param notificationMode The notification mode. It must be one of {@code NotificationUtils.NOTIFICATION_MODE_*}.
     * @return Returns the {@link Notification.Builder}.
     */
    @Nullable
-    public static Notification.Builder getPluginCommandErrorsNotificationBuilder(
-        final Context context, final CharSequence title, final CharSequence notificationText,
-        final CharSequence notificationBigText, final PendingIntent contentIntent, final PendingIntent deleteIntent, final int notificationMode) {
+    public static Notification.Builder getPluginCommandErrorsNotificationBuilder(final Context context, final CharSequence title, final CharSequence notificationText, final CharSequence notificationBigText, final PendingIntent pendingIntent, final int notificationMode) {

        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(context,
            TermuxConstants.TERMUX_PLUGIN_COMMAND_ERRORS_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_HIGH,
-            title, notificationText, notificationBigText, contentIntent, deleteIntent, notificationMode);
+            title, notificationText, notificationBigText, pendingIntent, notificationMode);

        if (builder == null)  return null;

@@ -319,14 +316,12 @@ public class PluginUtils {
     * Check if {@link TermuxConstants#PROP_ALLOW_EXTERNAL_APPS} property is not set to "true".
     *
     * @param context The {@link Context} to get error string.
-     * @return Returns the {@code error} if policy is violated, otherwise {@code null}.
+     * @return Returns the {@code errmsg} if policy is violated, otherwise {@code null}.
     */
-    public static String checkIfAllowExternalAppsPolicyIsViolated(final Context context, String apiName) {
+    public static String checkIfRunCommandServiceAllowExternalAppsPolicyIsViolated(final Context context) {
        String errmsg = null;
-        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(),
-            TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true)) {
-            errmsg = context.getString(R.string.error_allow_external_apps_ungranted, apiName,
-                TermuxFileUtils.getUnExpandedTermuxPath(TermuxConstants.TERMUX_PROPERTIES_PRIMARY_FILE_PATH));
+        if (!SharedProperties.isPropertyValueTrue(context, TermuxPropertyConstants.getTermuxPropertiesFile(), TermuxConstants.PROP_ALLOW_EXTERNAL_APPS)) {
+            errmsg = context.getString(R.string.error_run_command_service_allow_external_apps_ungranted);
        }

        return errmsg;
@@ -1,6 +1,7 @@
 package com.termux.filepicker;

 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -8,10 +9,7 @@ import android.provider.OpenableColumns;
 import android.util.Patterns;

 import com.termux.R;
-import com.termux.shared.data.DataUtils;
-import com.termux.shared.data.IntentUtils;
-import com.termux.shared.interact.MessageDialogUtils;
-import com.termux.shared.interact.TextInputDialogUtils;
+import com.termux.shared.interact.DialogUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
 import com.termux.app.TermuxService;
@@ -41,8 +39,6 @@ public class TermuxFileReceiverActivity extends Activity {
     */
    boolean mFinishOnDismissNameDialog = true;

-    private static final String API_TAG = TermuxConstants.TERMUX_APP_NAME + "FileReceiver";
-
    private static final String LOG_TAG = "TermuxFileReceiverActivity";

    static boolean isSharedTextAnUrl(String sharedText) {
@@ -59,66 +55,44 @@ public class TermuxFileReceiverActivity extends Activity {
        final String type = intent.getType();
        final String scheme = intent.getScheme();

-        Logger.logVerbose(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
-
-        final String sharedTitle = IntentUtils.getStringExtraIfSet(intent, Intent.EXTRA_TITLE, null);
-
        if (Intent.ACTION_SEND.equals(action) && type != null) {
            final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
            final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);

-            if (sharedUri != null) {
-                handleContentUri(sharedUri, sharedTitle);
-            } else if (sharedText != null) {
+            if (sharedText != null) {
                if (isSharedTextAnUrl(sharedText)) {
                    handleUrlAndFinish(sharedText);
                } else {
-                    String subject = IntentUtils.getStringExtraIfSet(intent, Intent.EXTRA_SUBJECT, null);
-                    if (subject == null) subject = sharedTitle;
+                    String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+                    if (subject == null) subject = intent.getStringExtra(Intent.EXTRA_TITLE);
                    if (subject != null) subject += ".txt";
                    promptNameAndSave(new ByteArrayInputStream(sharedText.getBytes(StandardCharsets.UTF_8)), subject);
                }
+            } else if (sharedUri != null) {
+                handleContentUri(sharedUri, intent.getStringExtra(Intent.EXTRA_TITLE));
            } else {
                showErrorDialogAndQuit("Send action without content - nothing to save.");
            }
+        } else if ("content".equals(scheme)) {
+            handleContentUri(intent.getData(), intent.getStringExtra(Intent.EXTRA_TITLE));
+        } else if ("file".equals(scheme)) {
+            // When e.g. clicking on a downloaded apk:
+            String path = intent.getData().getPath();
+            File file = new File(path);
+            try {
+                FileInputStream in = new FileInputStream(file);
+                promptNameAndSave(in, file.getName());
+            } catch (FileNotFoundException e) {
+                showErrorDialogAndQuit("Cannot open file: " + e.getMessage() + ".");
+            }
        } else {
-            Uri dataUri = intent.getData();
-
-            if (dataUri == null) {
-                showErrorDialogAndQuit("Data uri not passed.");
-                return;
-            }
-
-            if ("content".equals(scheme)) {
-                handleContentUri(dataUri, sharedTitle);
-            } else if ("file".equals(scheme)) {
-                // When e.g. clicking on a downloaded apk:
-                String path = dataUri.getPath();
-                if (DataUtils.isNullOrEmpty(path)) {
-                    showErrorDialogAndQuit("File path from data uri is null, empty or invalid.");
-                    return;
-                }
-
-                File file = new File(path);
-                try {
-                    FileInputStream in = new FileInputStream(file);
-                    promptNameAndSave(in, file.getName());
-                } catch (FileNotFoundException e) {
-                    showErrorDialogAndQuit("Cannot open file: " + e.getMessage() + ".");
-                }
-            } else {
-                showErrorDialogAndQuit("Unable to receive any file or URL.");
-            }
+            showErrorDialogAndQuit("Unable to receive any file or URL.");
        }
    }

    void showErrorDialogAndQuit(String message) {
        mFinishOnDismissNameDialog = false;
-        MessageDialogUtils.showMessage(this,
-            API_TAG, message,
-            null, (dialog, which) -> finish(),
-            null, null,
-            dialog -> finish());
+        new AlertDialog.Builder(this).setMessage(message).setOnDismissListener(dialog -> finish()).setPositiveButton(android.R.string.ok, (dialog, which) -> finish()).show();
    }

    void handleContentUri(final Uri uri, String subjectFromIntent) {
@@ -144,7 +118,7 @@ public class TermuxFileReceiverActivity extends Activity {
    }

    void promptNameAndSave(final InputStream in, final String attachmentFileName) {
-        TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
+        DialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
            File outFile = saveStreamWithName(in, text);
            if (outFile == null) return;

@@ -183,17 +157,10 @@ public class TermuxFileReceiverActivity extends Activity {

    public File saveStreamWithName(InputStream in, String attachmentFileName) {
        File receiveDir = new File(TERMUX_RECEIVEDIR);
-
-        if (DataUtils.isNullOrEmpty(attachmentFileName)) {
-            showErrorDialogAndQuit("File name cannot be null or empty");
-            return null;
-        }
-
        if (!receiveDir.isDirectory() && !receiveDir.mkdirs()) {
            showErrorDialogAndQuit("Cannot create directory: " + receiveDir.getAbsolutePath());
            return null;
        }
-
        try {
            final File outFile = new File(receiveDir, attachmentFileName);
            try (FileOutputStream f = new FileOutputStream(outFile)) {
@@ -215,7 +182,7 @@ public class TermuxFileReceiverActivity extends Activity {
        final File urlOpenerProgramFile = new File(URL_OPENER_PROGRAM);
        if (!urlOpenerProgramFile.isFile()) {
            showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-url-opener\n\n"
-                + "Create this file as a script or a symlink - it will be called with the shared URL as the first argument.");
+                + "Create this file as a script or a symlink - it will be called with the shared URL as only argument.");
            return;
        }

@@ -1,110 +1,80 @@
-<com.termux.app.terminal.TermuxActivityRootView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/activity_termux_root_view"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:fitsSystemWindows="true">

-    <RelativeLayout
-        android:id="@+id/activity_termux_root_relative_layout"
+    <androidx.drawerlayout.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginHorizontal="3dp"
-        android:layout_marginVertical="0dp"
-        android:orientation="vertical">
+        android:layout_alignParentTop="true"
+        android:layout_above="@+id/terminal_toolbar_view_pager"
+        android:layout_height="match_parent">

-        <androidx.drawerlayout.widget.DrawerLayout
-            android:id="@+id/drawer_layout"
+        <com.termux.view.TerminalView
+            android:id="@+id/terminal_view"
            android:layout_width="match_parent"
-            android:layout_alignParentTop="true"
-            android:layout_above="@+id/terminal_toolbar_view_pager"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_marginRight="3dp"
+            android:layout_marginLeft="3dp"
+            android:focusableInTouchMode="true"
+            android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
+            android:scrollbars="vertical"
+            android:importantForAutofill="no"
+            android:autofillHints="password" />

-            <com.termux.view.TerminalView
-                android:id="@+id/terminal_view"
+        <LinearLayout
+            android:id="@+id/left_drawer"
+            android:layout_width="240dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:background="@android:color/white"
+            android:choiceMode="singleChoice"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="0dp"
+            android:descendantFocusability="blocksDescendants"
+            android:orientation="vertical">
+
+            <ListView
+                android:id="@+id/terminal_sessions_list"
                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:focusableInTouchMode="true"
-                android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
-                android:scrollbars="vertical"
-                android:importantForAutofill="no"
-                android:autofillHints="password" />
+                android:layout_height="0dp"
+                android:layout_gravity="top"
+                android:layout_weight="1"
+                android:choiceMode="singleChoice"
+                android:longClickable="true" />

            <LinearLayout
-                android:id="@+id/left_drawer"
-                android:layout_width="240dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="start"
-                android:background="@android:color/white"
-                android:choiceMode="singleChoice"
-                android:divider="@android:color/transparent"
-                android:dividerHeight="0dp"
-                android:descendantFocusability="blocksDescendants"
-                android:orientation="vertical">
+                style="?android:attr/buttonBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">

-                <LinearLayout
+                <Button
+                    android:id="@+id/toggle_keyboard_button"
+                    style="?android:attr/buttonBarButtonStyle"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <ImageButton
-                        android:id="@+id/settings_button"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@drawable/ic_settings"
-                        android:background="@null"
-                        android:contentDescription="@string/action_open_settings" />
-                </LinearLayout>
-
-                <ListView
-                    android:id="@+id/terminal_sessions_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_gravity="top"
                    android:layout_weight="1"
-                    android:choiceMode="singleChoice"
-                    android:longClickable="true" />
+                    android:text="@string/action_toggle_soft_keyboard" />

-                <LinearLayout
-                    style="?android:attr/buttonBarStyle"
+                <Button
+                    android:id="@+id/new_session_button"
+                    style="?android:attr/buttonBarButtonStyle"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/toggle_keyboard_button"
-                        style="?android:attr/buttonBarButtonStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/action_toggle_soft_keyboard" />
-
-                    <Button
-                        android:id="@+id/new_session_button"
-                        style="?android:attr/buttonBarButtonStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/action_new_session" />
-                </LinearLayout>
+                    android:layout_weight="1"
+                    android:text="@string/action_new_session" />
            </LinearLayout>
+        </LinearLayout>

-        </androidx.drawerlayout.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>

-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/terminal_toolbar_view_pager"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="37.5dp"
-            android:background="@android:drawable/screen_background_dark_transparent"
-            android:layout_alignParentBottom="true" />
-
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/activity_termux_bottom_space_view"
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/terminal_toolbar_view_pager"
+        android:visibility="gone"
        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@android:color/transparent" />
-
-</com.termux.app.terminal.TermuxActivityRootView>
+        android:layout_height="37.5dp"
+        android:background="@android:drawable/screen_background_dark_transparent"
+        android:layout_alignParentBottom="true" />
+</RelativeLayout>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-appcompat-release/preference/preference/res/layout/preference.xml
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-    <TextView android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <include android:id="@android:id/summary" layout="@layout/markdown_adapter_node_default" />
-
-</LinearLayout>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.termux.shared.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.termux.app.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/terminal_toolbar_extra_keys"
    style="?android:attr/buttonBarStyle"
    android:layout_width="match_parent"
@@ -12,9 +12,4 @@
        android:icon="@drawable/ic_copy"
        android:title="@string/action_copy"
        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_item_save_report_to_file"
-        android:title="@string/action_save_to_file"
-        app:showAsAction="never" />
 </menu>
@@ -9,10 +9,10 @@
    <!ENTITY TERMUX_STYLING_APP_NAME "Termux:Styling">
    <!ENTITY TERMUX_TASKER_APP_NAME "Termux:Tasker">
    <!ENTITY TERMUX_WIDGET_APP_NAME "Termux:Widget">
+    <!ENTITY TERMUX_PROPERTIES_PRIMARY_PATH_SHORT "~/.termux/termux.properties">
    ]>

 <resources>
-
    <string name="application_name">&TERMUX_APP_NAME;</string>
    <string name="shared_user_label">&TERMUX_APP_NAME; user</string>

@@ -21,7 +21,7 @@
    <!-- Termux RUN_COMMAND permission -->
    <string name="permission_run_command_label">Run commands in &TERMUX_APP_NAME; environment</string>
    <string name="permission_run_command_description">execute arbitrary commands within &TERMUX_APP_NAME;
-        environment and access files</string>
+        environment</string>



@@ -31,9 +31,7 @@
    <string name="bootstrap_error_body">&TERMUX_APP_NAME; was unable to install the bootstrap packages.</string>
    <string name="bootstrap_error_abort">Abort</string>
    <string name="bootstrap_error_try_again">Try again</string>
-    <string name="bootstrap_error_not_primary_user_message">&TERMUX_APP_NAME; can only be run as the primary user.
-        \nBootstrap binaries compiled for &TERMUX_APP_NAME; have hardcoded $PREFIX path and cannot be installed
-        under any path other than %1$s.</string>
+    <string name="bootstrap_error_not_primary_user_message">&TERMUX_APP_NAME; can only be run as the primary user.\nBootstrap binaries compiled for &TERMUX_APP_NAME; have hardcoded $PREFIX path and cannot be installed under any path other than \"%1$s\".</string>



@@ -68,7 +66,7 @@
    <string name="action_autofill_password">Autofill password</string>

    <string name="action_reset_terminal">Reset</string>
-    <string name="msg_terminal_reset">Terminal reset</string>
+    <string name="msg_terminal_reset">Terminal reset.</string>

    <string name="action_kill_process">Kill process (%d)</string>
    <string name="title_confirm_kill_process">Really kill this session?</string>
@@ -77,10 +75,7 @@
    <string name="action_toggle_keep_screen_on">Keep screen on</string>
    <string name="action_open_help">Help</string>
    <string name="action_open_settings">Settings</string>
-
    <string name="action_report_issue">Report Issue</string>
-    <string name="msg_generating_report">Generating Report</string>
-    <string name="msg_add_termux_debug_info">Add termux debug info to report?</string>

    <string name="error_styling_not_installed">The &TERMUX_STYLING_APP_NAME; Plugin App is not installed.</string>
    <string name="action_styling_install">Install</string>
@@ -94,20 +89,29 @@



-    <!-- TermuxService -->
-    <string name="error_display_over_other_apps_permission_not_granted">&TERMUX_APP_NAME; requires
-        \"Display over other apps\" permission to start terminal sessions from background on Android >= 10.
-        Grants it from Settings -> Apps -> &TERMUX_APP_NAME; -> Advanced</string>
-
-
-
    <!-- Termux RunCommandService -->
    <string name="error_run_command_service_invalid_intent_action">Invalid intent action to RunCommandService: `%1$s`</string>
    <string name="error_run_command_service_mandatory_extra_missing">Mandatory extra missing to RunCommandService: \"%1$s\"</string>
+    <string name="error_run_command_service_allow_external_apps_ungranted">RunCommandService require `allow-external-apps` property to be set to `true` in `&TERMUX_PROPERTIES_PRIMARY_PATH_SHORT;` file.</string>
    <string name="error_run_command_service_api_help">Visit %1$s for more info on RUN_COMMAND Intent usage.</string>



+    <!-- Termux Execution Commands -->
+    <string name="msg_executable_absolute_path">Executable Absolute Path: \"%1$s\"</string>
+    <string name="msg_working_directory_absolute_path">Working Directory Absolute Path: \"%1$s\"</string>
+
+
+
+    <!-- Termux Report And ShareUtils -->
+    <string name="action_copy">Copy</string>
+    <string name="action_share">Share</string>
+
+    <string name="title_share_with">Share With</string>
+    <string name="title_report_text">Report Text</string>
+
+
+
    <!-- Termux File Receiver -->
    <string name="title_file_received">Save file in ~/downloads/</string>
    <string name="action_file_received_edit">Edit</string>
@@ -115,110 +119,40 @@



-    <!-- Miscellaneous -->
-    <string name="error_allow_external_apps_ungranted">%1$s requires `allow-external-apps`
-        property to be set to `true` in `%2$s` file.</string>
-
-
-
    <!-- Termux Settings -->
    <string name="title_activity_termux_settings">&TERMUX_APP_NAME; Settings</string>

-    <!-- Termux App Preferences -->
-    <string name="termux_preferences_title">&TERMUX_APP_NAME;</string>
-    <string name="termux_preferences_summary">Preferences for &TERMUX_APP_NAME; app</string>
+    <!-- Debugging Preferences -->
+    <string name="debugging_preferences">Debugging</string>

-        <!-- Debugging Preferences -->
-        <string name="termux_debugging_preferences_title">Debugging</string>
-        <string name="termux_debugging_preferences_summary">Preferences for debugging</string>
+        <!-- Logging Category -->
+        <string name="logging_header">Logging</string>

-            <!-- Logging Category -->
-            <string name="termux_logging_header">Logging</string>
+            <!-- Terminal View Key Logging -->
+            <string name="terminal_view_key_logging_title">Terminal View Key Logging</string>
+            <string name="terminal_view_key_logging_off">Logs will not have entries for terminal view keys. (Default)</string>
+            <string name="terminal_view_key_logging_on">Logcat logs will have entries for terminal view keys. These are very verbose and should be disabled under normal circumstances or will cause performance issues.</string>

-                <!-- Log Level -->
-                <string name="termux_log_level_title">Log Level</string>
+            <!-- Plugin Error Notifications -->
+            <string name="plugin_error_notifications_title">Plugin Error Notifications</string>
+            <string name="plugin_error_notifications_off">Disable flashes and notifications for plugin errors.</string>
+            <string name="plugin_error_notifications_on">Show flashes and notifications for plugin errors. (Default)</string>

-                <!-- Terminal View Key Logging -->
-                <string name="termux_terminal_view_key_logging_enabled_title">Terminal View Key Logging</string>
-                <string name="termux_terminal_view_key_logging_enabled_off">Logs will not have entries for terminal view keys. (Default)</string>
-                <string name="termux_terminal_view_key_logging_enabled_on">Logcat logs will have entries for terminal view keys.
-                    These are very verbose and should be disabled under normal circumstances or will cause performance issues.</string>
-
-                <!-- Plugin Error Notifications -->
-                <string name="termux_plugin_error_notifications_enabled_title">Plugin Error Notifications</string>
-                <string name="termux_plugin_error_notifications_enabled_off">Disable flashes and notifications for plugin errors.</string>
-                <string name="termux_plugin_error_notifications_enabled_on">Show flashes and notifications for plugin errors. (Default)</string>
-
-                <!-- Crash Report Notifications -->
-                <string name="termux_crash_report_notifications_enabled_title">Crash Report Notifications</string>
-                <string name="termux_crash_report_notifications_enabled_off">Disable notifications for crash reports.</string>
-                <string name="termux_crash_report_notifications_enabled_on">Show notifications for crash reports. (Default)</string>
+            <!-- Crash Report Notifications -->
+            <string name="crash_report_notifications_title">Crash Report Notifications</string>
+            <string name="crash_report_notifications_off">Disable notifications for crash reports.</string>
+            <string name="crash_report_notifications_on">Show notifications for crash reports. (Default)</string>


-        <!-- Terminal IO Preferences -->
-        <string name="termux_terminal_io_preferences_title">Terminal I/O</string>
-        <string name="termux_terminal_io_preferences_summary">Preferences for terminal I/O</string>
+    <!-- Terminal IO Preferences -->
+    <string name="terminal_io_preferences">Terminal I/O</string>

-            <!-- Keyboard Category -->
-            <string name="termux_keyboard_header">Keyboard</string>
+        <!-- Keyboard Category -->
+        <string name="keyboard_header">Keyboard</string>

-                <!-- Soft Keyboard -->
-                <string name="termux_soft_keyboard_enabled_title">Soft Keyboard Enabled</string>
-                <string name="termux_soft_keyboard_enabled_off">Soft keyboard will be disabled.</string>
-                <string name="termux_soft_keyboard_enabled_on">Soft keyboard will be enabled. (Default)</string>
-
-                <!-- Soft Keyboard Only If No Hardware-->
-                <string name="termux_soft_keyboard_enabled_only_if_no_hardware_title">Soft Keyboard Only If No Hardware</string>
-                <string name="termux_soft_keyboard_enabled_only_if_no_hardware_off">Soft keyboard will be enabled even if
-                    hardware keyboard is connected. (Default)</string>
-                <string name="termux_soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if
-                    no hardware keyboard is connected.</string>
-
-
-        <!-- Terminal View Preferences -->
-        <string name="termux_terminal_view_preferences_title">Terminal View</string>
-        <string name="termux_terminal_view_preferences_summary">Preferences for terminal view</string>
-
-            <!-- View Category -->
-            <string name="termux_terminal_view_view_header">View</string>
-
-                <!-- Terminal View Margin Adjustment -->
-                <string name="termux_terminal_view_terminal_margin_adjustment_title">Terminal Margin Adjustment</string>
-                <string name="termux_terminal_view_terminal_margin_adjustment_off">Terminal margin adjustment will be disabled.</string>
-                <string name="termux_terminal_view_terminal_margin_adjustment_on">Terminal margin adjustment will be enabled.
-                    It should be enabled to try to fix the issue where soft keyboard covers part of extra keys/terminal view.
-                    If it causes screen flickering on your devices, then disable it. (Default)</string>
-
-
-
-    <!-- Termux:API App Preferences -->
-    <string name="termux_api_preferences_title">&TERMUX_API_APP_NAME;</string>
-    <string name="termux_api_preferences_summary">Preferences for &TERMUX_API_APP_NAME; app</string>
-
-
-
-    <!-- Termux:Float App Preferences -->
-    <string name="termux_float_preferences_title">&TERMUX_FLOAT_APP_NAME;</string>
-    <string name="termux_float_preferences_summary">Preferences for &TERMUX_FLOAT_APP_NAME; app</string>
-
-
-
-    <!-- Termux:Tasker App Preferences -->
-    <string name="termux_tasker_preferences_title">&TERMUX_TASKER_APP_NAME;</string>
-    <string name="termux_tasker_preferences_summary">Preferences for &TERMUX_TASKER_APP_NAME; app</string>
-
-
-
-    <!-- Termux:Widget App Preferences -->
-    <string name="termux_widget_preferences_title">&TERMUX_WIDGET_APP_NAME;</string>
-    <string name="termux_widget_preferences_summary">Preferences for &TERMUX_WIDGET_APP_NAME; app</string>
-
-
-
-    <!-- About Preference -->
-    <string name="about_preference_title">About</string>
-
-    <!-- Donate Preference -->
-    <string name="donate_preference_title">Donate</string>
+            <!-- Soft Keyboard -->
+            <string name="soft_keyboard_title">Soft Keyboard</string>
+            <string name="soft_keyboard_off">Soft keyboard will be disabled.</string>
+            <string name="soft_keyboard_on">Soft keyboard will be enabled. (Default)</string>

 </resources>
@@ -44,6 +44,15 @@
    </style>


+    <style name="Theme.AppCompat.TermuxReportActivity" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimaryDark">#FF0000</item>
+    </style>
+
+    <style name="Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+
    <style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">
        <!-- Seen in buttons on alert dialog: -->
        <item name="android:colorAccent">#212121</item>
@@ -0,0 +1,33 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:key="logging"
+        app:title="@string/logging_header">
+
+        <ListPreference
+            app:defaultValue="1"
+            app:key="log_level"
+            app:title="@string/log_level_title"
+            app:useSimpleSummaryProvider="true" />
+
+        <SwitchPreferenceCompat
+            app:key="terminal_view_key_logging_enabled"
+            app:summaryOff="@string/terminal_view_key_logging_off"
+            app:summaryOn="@string/terminal_view_key_logging_on"
+            app:title="@string/terminal_view_key_logging_title" />
+
+        <SwitchPreferenceCompat
+            app:key="plugin_error_notifications_enabled"
+            app:summaryOff="@string/plugin_error_notifications_off"
+            app:summaryOn="@string/plugin_error_notifications_on"
+            app:title="@string/plugin_error_notifications_title" />
+
+        <SwitchPreferenceCompat
+            app:key="crash_report_notifications_enabled"
+            app:summaryOff="@string/crash_report_notifications_off"
+            app:summaryOn="@string/crash_report_notifications_on"
+            app:title="@string/crash_report_notifications_title" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
@@ -1,49 +1,13 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">

    <Preference
-        app:key="termux"
-        app:title="@string/termux_preferences_title"
-        app:summary="@string/termux_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.TermuxPreferencesFragment"/>
+        app:title="@string/debugging_preferences"
+        app:summary="Preferences for debugging"
+        app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>

    <Preference
-        app:key="termux_api"
-        app:title="@string/termux_api_preferences_title"
-        app:summary="@string/termux_api_preferences_summary"
-        app:isPreferenceVisible="false"
-        app:fragment="com.termux.app.fragments.settings.TermuxAPIPreferencesFragment"/>
-
-    <Preference
-        app:key="termux_float"
-        app:title="@string/termux_float_preferences_title"
-        app:summary="@string/termux_float_preferences_summary"
-        app:isPreferenceVisible="false"
-        app:fragment="com.termux.app.fragments.settings.TermuxFloatPreferencesFragment"/>
-
-    <Preference
-        app:key="termux_tasker"
-        app:title="@string/termux_tasker_preferences_title"
-        app:summary="@string/termux_tasker_preferences_summary"
-        app:isPreferenceVisible="false"
-        app:fragment="com.termux.app.fragments.settings.TermuxTaskerPreferencesFragment"/>
-
-    <Preference
-        app:key="termux_widget"
-        app:title="@string/termux_widget_preferences_title"
-        app:summary="@string/termux_widget_preferences_summary"
-        app:isPreferenceVisible="false"
-        app:fragment="com.termux.app.fragments.settings.TermuxWidgetPreferencesFragment"/>
-
-    <Preference
-        app:key="about"
-        app:title="@string/about_preference_title"
-        app:persistent="false"/>
-    <!-- app:layout="@layout/preference_markdown_text" -->
-
-    <Preference
-        app:key="donate"
-        app:title="@string/donate_preference_title"
-        app:persistent="false"
-        app:isPreferenceVisible="false"/>
+        app:title="@string/terminal_io_preferences"
+        app:summary="Preferences for terminal I/O"
+        app:fragment="com.termux.app.fragments.settings.TerminalIOPreferencesFragment"/>

 </PreferenceScreen>
@@ -0,0 +1,15 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:key="keyboard"
+        app:title="@string/keyboard_header">
+
+        <SwitchPreferenceCompat
+            app:key="soft_keyboard_enabled"
+            app:summaryOff="@string/soft_keyboard_off"
+            app:summaryOn="@string/soft_keyboard_on"
+            app:title="@string/soft_keyboard_title" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
@@ -1,15 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="logging"
-        app:title="@string/termux_logging_header">
-
-        <ListPreference
-            app:defaultValue="1"
-            app:key="log_level"
-            app:title="@string/termux_log_level_title"
-            app:useSimpleSummaryProvider="true" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,8 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:title="@string/termux_debugging_preferences_title"
-        app:summary="@string/termux_debugging_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux_api.DebuggingPreferencesFragment"/>
-
-</PreferenceScreen>
@@ -1,33 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="logging"
-        app:title="@string/termux_logging_header">
-
-        <ListPreference
-            app:defaultValue="1"
-            app:key="log_level"
-            app:title="@string/termux_log_level_title"
-            app:useSimpleSummaryProvider="true" />
-
-        <SwitchPreferenceCompat
-            app:key="terminal_view_key_logging_enabled"
-            app:summaryOff="@string/termux_terminal_view_key_logging_enabled_off"
-            app:summaryOn="@string/termux_terminal_view_key_logging_enabled_on"
-            app:title="@string/termux_terminal_view_key_logging_enabled_title" />
-
-        <SwitchPreferenceCompat
-            app:key="plugin_error_notifications_enabled"
-            app:summaryOff="@string/termux_plugin_error_notifications_enabled_off"
-            app:summaryOn="@string/termux_plugin_error_notifications_enabled_on"
-            app:title="@string/termux_plugin_error_notifications_enabled_title" />
-
-        <SwitchPreferenceCompat
-            app:key="crash_report_notifications_enabled"
-            app:summaryOff="@string/termux_crash_report_notifications_enabled_off"
-            app:summaryOn="@string/termux_crash_report_notifications_enabled_on"
-            app:title="@string/termux_crash_report_notifications_enabled_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,21 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="logging"
-        app:title="@string/termux_logging_header">
-
-        <ListPreference
-            app:defaultValue="1"
-            app:key="log_level"
-            app:title="@string/termux_log_level_title"
-            app:useSimpleSummaryProvider="true" />
-
-        <SwitchPreferenceCompat
-            app:key="terminal_view_key_logging_enabled"
-            app:summaryOff="@string/termux_terminal_view_key_logging_enabled_off"
-            app:summaryOn="@string/termux_terminal_view_key_logging_enabled_on"
-            app:title="@string/termux_terminal_view_key_logging_enabled_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,8 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:title="@string/termux_debugging_preferences_title"
-        app:summary="@string/termux_debugging_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux_float.DebuggingPreferencesFragment"/>
-
-</PreferenceScreen>
@@ -1,18 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:title="@string/termux_debugging_preferences_title"
-        app:summary="@string/termux_debugging_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux.DebuggingPreferencesFragment"/>
-
-    <Preference
-        app:title="@string/termux_terminal_io_preferences_title"
-        app:summary="@string/termux_terminal_io_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux.TerminalIOPreferencesFragment"/>
-
-    <Preference
-        app:title="@string/termux_terminal_view_preferences_title"
-        app:summary="@string/termux_terminal_view_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux.TerminalViewPreferencesFragment"/>
-
-</PreferenceScreen>
@@ -1,15 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="logging"
-        app:title="@string/termux_logging_header">
-
-        <ListPreference
-            app:defaultValue="1"
-            app:key="log_level"
-            app:title="@string/termux_log_level_title"
-            app:useSimpleSummaryProvider="true" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,8 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:title="@string/termux_debugging_preferences_title"
-        app:summary="@string/termux_debugging_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux_tasker.DebuggingPreferencesFragment"/>
-
-</PreferenceScreen>
@@ -1,21 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="keyboard"
-        app:title="@string/termux_keyboard_header">
-
-        <SwitchPreferenceCompat
-            app:key="soft_keyboard_enabled"
-            app:summaryOff="@string/termux_soft_keyboard_enabled_off"
-            app:summaryOn="@string/termux_soft_keyboard_enabled_on"
-            app:title="@string/termux_soft_keyboard_enabled_title" />
-
-        <SwitchPreferenceCompat
-            app:key="soft_keyboard_enabled_only_if_no_hardware"
-            app:summaryOff="@string/termux_soft_keyboard_enabled_only_if_no_hardware_off"
-            app:summaryOn="@string/termux_soft_keyboard_enabled_only_if_no_hardware_on"
-            app:title="@string/termux_soft_keyboard_enabled_only_if_no_hardware_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,15 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="view"
-        app:title="@string/termux_terminal_view_view_header">
-
-        <SwitchPreferenceCompat
-            app:key="terminal_margin_adjustment"
-            app:summaryOff="@string/termux_terminal_view_terminal_margin_adjustment_off"
-            app:summaryOn="@string/termux_terminal_view_terminal_margin_adjustment_on"
-            app:title="@string/termux_terminal_view_terminal_margin_adjustment_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,15 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        app:key="logging"
-        app:title="@string/termux_logging_header">
-
-        <ListPreference
-            app:defaultValue="1"
-            app:key="log_level"
-            app:title="@string/termux_log_level_title"
-            app:useSimpleSummaryProvider="true" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
@@ -1,8 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        app:title="@string/termux_debugging_preferences_title"
-        app:summary="@string/termux_debugging_preferences_summary"
-        app:fragment="com.termux.app.fragments.settings.termux_widget.DebuggingPreferencesFragment"/>
-
-</PreferenceScreen>
@@ -1,6 +1,6 @@
 package com.termux.app;

-import com.termux.shared.data.UrlUtils;
+import com.termux.shared.data.DataUtils;

 import org.junit.Assert;
 import org.junit.Test;
@@ -13,7 +13,7 @@ public class TermuxActivityTest {
    private void assertUrlsAre(String text, String... urls) {
        LinkedHashSet<String> expected = new LinkedHashSet<>();
        Collections.addAll(expected, urls);
-        Assert.assertEquals(expected, UrlUtils.extractUrls(text));
+        Assert.assertEquals(expected, DataUtils.extractUrls(text));
    }

    @Test
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.termux">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+
+    <application>
+      <service
+            android:name=".app.TermuxPackageInstallerService"
+            android:exported="false" />
+    </application>
+
+</manifest>
@@ -0,0 +1,138 @@
+package com.termux.app;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Process;
+import android.system.Os;
+import android.util.Log;
+
+import com.termux.shared.termux.TermuxConstants;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class TermuxPackageInstaller extends BroadcastReceiver {
+
+    private static final String LOG_TAG = "termux-package-installer";
+
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        try {
+            String packageName = intent.getData().getSchemeSpecificPart();
+            String action = intent.getAction();
+            PackageManager packageManager = context.getPackageManager();
+
+            if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
+                ApplicationInfo info = packageManager.getApplicationInfo(packageName, 0);
+                if (Process.myUid() == info.uid) {
+                    installPackage(context, info);
+                }
+            } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
+                if (Process.myUid() == intent.getIntExtra(Intent.EXTRA_UID, -1)) {
+                    uninstallPackage(packageName);
+                }
+
+            }
+        } catch (Exception e) {
+            Log.e("termux", "Error in package management: " + e);
+        }
+    }
+
+    static void installPackage(Context context, ApplicationInfo info) throws Exception {
+        File filesMappingFile = new File(info.nativeLibraryDir, "libfiles.so");
+        if (!filesMappingFile.exists()) {
+            Log.e("termux", "No file mapping at " + filesMappingFile.getAbsolutePath());
+            return;
+        }
+
+        Log.e("termux", "Installing: " + info.packageName);
+        BufferedReader reader = new BufferedReader(new FileReader(filesMappingFile));
+        String line;
+        while ((line = reader.readLine()) != null) {
+            String[] parts = line.split("←");
+            if (parts.length != 2) {
+                Log.e(LOG_TAG, "Malformed line " + line + " in " + filesMappingFile.getAbsolutePath());
+                continue;
+            }
+
+            String oldPath = info.nativeLibraryDir + "/" + parts[0];
+            String newPath = TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/" + parts[1];
+
+            TermuxInstaller.ensureDirectoryExists(context, new File(newPath).getParentFile());
+
+            Log.e(LOG_TAG, "About to setup link: " + oldPath + " ← " + newPath);
+            new File(newPath).delete();
+            Os.symlink(oldPath, newPath);
+        }
+
+        File symlinksFile = new File(info.nativeLibraryDir, "libsymlinks.so");
+        if (!symlinksFile.exists()) {
+            Log.e("termux", "No symlinks mapping at " + symlinksFile.getAbsolutePath());
+        }
+
+        reader = new BufferedReader(new FileReader(symlinksFile));
+        while ((line = reader.readLine()) != null) {
+            String[] parts = line.split("←");
+            if (parts.length != 2) {
+                Log.e(LOG_TAG, "Malformed line " + line + " in " + symlinksFile.getAbsolutePath());
+                continue;
+            }
+
+            String oldPath = parts[0];
+            String newPath = TermuxConstants.TERMUX_PREFIX_DIR_PATH + "/" + parts[1];
+
+            TermuxInstaller.ensureDirectoryExists(context, new File(newPath).getParentFile());
+
+            Log.e(LOG_TAG, "About to setup link: " + oldPath + " ← " + newPath);
+            new File(newPath).delete();
+            Os.symlink(oldPath, newPath);
+        }
+    }
+
+    private static void uninstallPackage(String packageName) throws IOException {
+        Log.e(LOG_TAG, "Uninstalling: " + packageName);
+        // We're currently visiting the whole $PREFIX.
+        // If we store installed symlinks in installPackage() we could just visit those,
+        // at the cost of increased complexity and risk for errors.
+        File prefixDir = new File(TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+        removeBrokenSymlinks(prefixDir);
+    }
+
+    private static void removeBrokenSymlinks(File parentDir) throws IOException {
+        File[] children = parentDir.listFiles();
+        if (children == null) {
+            return;
+        }
+        for (File child : children) {
+            if (!child.exists()) {
+                Log.e(LOG_TAG, "Removing broken symlink: " + child.getAbsolutePath());
+                child.delete();
+            } else if (child.isDirectory()) {
+                removeBrokenSymlinks(child);
+            }
+        }
+    }
+
+    public static void setupAllInstalledPackages(Context context) {
+        try {
+            removeBrokenSymlinks(new File(TermuxConstants.TERMUX_PREFIX_DIR_PATH));
+
+            PackageManager packageManager = context.getPackageManager();
+            for (PackageInfo info : packageManager.getInstalledPackages(0)) {
+                if ("com.termux".equals(info.sharedUserId)) {
+                    installPackage(context, info.applicationInfo);
+                }
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Error setting up all packages", e);
+        }
+
+    }
+}
@@ -0,0 +1,56 @@
+package com.termux.app;
+
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Process;
+import android.system.Os;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.termux.shared.termux.TermuxConstants;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class TermuxPackageInstallerService extends Service {
+
+    private static final String LOG_TAG = "termux-package-installer";
+
+    class LocalBinder extends Binder {
+        public final TermuxPackageInstallerService service = TermuxPackageInstallerService.this;
+    }
+
+    private final IBinder mBinder = new LocalBinder();
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        TermuxPackageInstaller packageInstaller = new TermuxPackageInstaller();
+        TermuxPackageInstaller.setupAllInstalledPackages(this);
+
+        IntentFilter addedFilter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+        addedFilter.addDataScheme("package");
+        IntentFilter removedFilter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
+        removedFilter.addDataScheme("package");
+        this.registerReceiver(packageInstaller, addedFilter);
+        this.registerReceiver(packageInstaller, removedFilter);
+    }
+}
@@ -4,7 +4,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
    }
 }

@@ -12,7 +12,6 @@ allprojects {
    repositories {
        google()
        mavenCentral()
-        maven { url "https://jitpack.io" }
    }
 }

@@ -15,8 +15,12 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true

+termuxVersion=0.111
+termuxVersionCode=111
+
 minSdkVersion=24
 targetSdkVersion=28
+updatedTargetSdkVersion=30
 ndkVersion=22.1.7171670
 compileSdkVersion=30

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -1,2 +0,0 @@
-env:
-  JITPACK_NDK_VERSION: "21.1.6352462"
@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'

 android {
    compileSdkVersion project.properties.compileSdkVersion.toInteger()
-    ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
+    ndkVersion project.properties.ndkVersion

    defaultConfig {
        minSdkVersion project.properties.minSdkVersion.toInteger()
@@ -58,16 +58,25 @@ task sourceJar(type: Jar) {
    classifier "sources"
 }

-afterEvaluate {
-    publishing {
-        publications {
-            // Creates a Maven publication called "release".
-            release(MavenPublication) {
-                from components.release
-                groupId = 'com.termux'
-                artifactId = 'terminal-emulator'
-                version = '0.117'
-                artifact(sourceJar)
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId 'com.termux'
+            artifactId 'terminal-emulator'
+            version "0.112"
+            artifact(sourceJar)
+            artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
+        }
+    }
+ 
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/termux/termux-app")
+
+            credentials {
+                username = System.getenv("GH_USERNAME")
+                password = System.getenv("GH_TOKEN")
            }
        }
    }
@@ -102,45 +102,6 @@ public final class TerminalBuffer {
        return builder.toString();
    }

-    public String getWordAtLocation(int x, int y) {
-        // Set y1 and y2 to the lines where the wrapped line starts and ends.
-        // I.e. if a line that is wrapped to 3 lines starts at line 4, and this
-        // is called with y=5, then y1 would be set to 4 and y2 would be set to 6.
-        int y1 = y;
-        int y2 = y;
-        while (y1 > 0 && !getSelectedText(0, y1 - 1, mColumns, y, true, true).contains("\n")) {
-            y1--;
-        }
-        while (y2 < mScreenRows && !getSelectedText(0, y, mColumns, y2 + 1, true, true).contains("\n")) {
-            y2++;
-        }
-
-        // Get the text for the whole wrapped line
-        String text = getSelectedText(0, y1, mColumns, y2, true, true);
-        // The index of x in text
-        int textOffset = (y - y1) * mColumns + x;
-
-        if (textOffset >= text.length()) {
-          // The click was to the right of the last word on the line, so
-          // there's no word to return
-          return "";
-        }
-
-        // Set x1 and x2 to the indices of the last space before x and the
-        // first space after x in text respectively
-        int x1 = text.lastIndexOf(' ', textOffset);
-        int x2 = text.indexOf(' ', textOffset);
-        if (x2 == -1) {
-            x2 = text.length();
-        }
-
-        if (x1 == x2) {
-          // The click was on a space, so there's no word to return
-          return "";
-        }
-        return text.substring(x1 + 1, x2);
-    }
-
    public int getActiveTranscriptRows() {
        return mActiveTranscriptRows;
    }
@@ -57,7 +57,7 @@ public final class TerminalColorScheme {
        0xff808080, 0xff8a8a8a, 0xff949494, 0xff9e9e9e, 0xffa8a8a8, 0xffb2b2b2, 0xffbcbcbc, 0xffc6c6c6, 0xffd0d0d0, 0xffdadada, 0xffe4e4e4, 0xffeeeeee,

        // COLOR_INDEX_DEFAULT_FOREGROUND, COLOR_INDEX_DEFAULT_BACKGROUND and COLOR_INDEX_DEFAULT_CURSOR:
-        0xffffffff, 0xff000000, 0xffffffff};
+        0xffffffff, 0xff000000, 0xffA9AAA9};

    public final int[] mDefaultColors = new int[TextStyle.NUM_INDEXED_COLORS];

@@ -38,6 +38,10 @@ public final class TerminalEmulator {
    public static final int MOUSE_WHEELUP_BUTTON = 64;
    public static final int MOUSE_WHEELDOWN_BUTTON = 65;

+    public static final int CURSOR_STYLE_BLOCK = 0;
+    public static final int CURSOR_STYLE_UNDERLINE = 1;
+    public static final int CURSOR_STYLE_BAR = 2;
+
    /** Used for invalid data - http://en.wikipedia.org/wiki/Replacement_character#Replacement_character */
    public static final int UNICODE_REPLACEMENT_CHAR = 0xFFFD;

@@ -104,8 +108,8 @@ public final class TerminalEmulator {
     * characters received when the cursor is at the right border of the page replace characters already on the page."
     */
    private static final int DECSET_BIT_AUTOWRAP = 1 << 3;
-    /** DECSET 25 - if the cursor should be enabled, {@link #isCursorEnabled()}. */
-    private static final int DECSET_BIT_CURSOR_ENABLED = 1 << 4;
+    /** DECSET 25 - if the cursor should be visible, {@link #isShowingCursor()}. */
+    private static final int DECSET_BIT_SHOWING_CURSOR = 1 << 4;
    private static final int DECSET_BIT_APPLICATION_KEYPAD = 1 << 5;
    /** DECSET 1000 - if to report mouse press&release events. */
    private static final int DECSET_BIT_MOUSE_TRACKING_PRESS_RELEASE = 1 << 6;
@@ -122,35 +126,17 @@ public final class TerminalEmulator {
    /** Not really DECSET bit... - http://www.vt100.net/docs/vt510-rm/DECSACE */
    private static final int DECSET_BIT_RECTANGULAR_CHANGEATTRIBUTE = 1 << 12;

-
    private String mTitle;
    private final Stack<String> mTitleStack = new Stack<>();

-
    /** The cursor position. Between (0,0) and (mRows-1, mColumns-1). */
    private int mCursorRow, mCursorCol;

+    private int mCursorStyle = CURSOR_STYLE_BLOCK;
+
    /** The number of character rows and columns in the terminal screen. */
    public int mRows, mColumns;

-    /** The number of terminal transcript rows that can be scrolled back to. */
-    public static final int TERMINAL_TRANSCRIPT_ROWS_MIN = 100;
-    public static final int TERMINAL_TRANSCRIPT_ROWS_MAX = 50000;
-    public static final int DEFAULT_TERMINAL_TRANSCRIPT_ROWS = 2000;
-
-
-    /* The supported terminal cursor styles. */
-
-    public static final int TERMINAL_CURSOR_STYLE_BLOCK = 0;
-    public static final int TERMINAL_CURSOR_STYLE_UNDERLINE = 1;
-    public static final int TERMINAL_CURSOR_STYLE_BAR = 2;
-    public static final int DEFAULT_TERMINAL_CURSOR_STYLE = TERMINAL_CURSOR_STYLE_BLOCK;
-    public static final Integer[] TERMINAL_CURSOR_STYLES_LIST = new Integer[]{TERMINAL_CURSOR_STYLE_BLOCK, TERMINAL_CURSOR_STYLE_UNDERLINE, TERMINAL_CURSOR_STYLE_BAR};
-
-    /** The terminal cursor styles. */
-    private int mCursorStyle = DEFAULT_TERMINAL_CURSOR_STYLE;
-
-
    /** The normal screen buffer. Stores the characters that appear on the screen of the emulated terminal. */
    private final TerminalBuffer mMainBuffer;
    /**
@@ -219,18 +205,6 @@ public final class TerminalEmulator {
     */
    private boolean mAboutToAutoWrap;

-    /**
-     * If the cursor blinking is enabled. It requires cursor itself to be enabled, which is controlled
-     * byt whether {@link #DECSET_BIT_CURSOR_ENABLED} bit is set or not.
-     */
-    private boolean mCursorBlinkingEnabled;
-
-    /**
-     * If currently cursor should be in a visible state or not if {@link #mCursorBlinkingEnabled}
-     * is {@code true}.
-     */
-    private boolean mCursorBlinkState;
-
    /**
     * Current foreground and background colors. Can either be a color index in [0,259] or a truecolor (24-bit) value.
     * For a 24-bit value the top byte (0xff000000) is set.
@@ -287,7 +261,7 @@ public final class TerminalEmulator {
            case 7:
                return DECSET_BIT_AUTOWRAP;
            case 25:
-                return DECSET_BIT_CURSOR_ENABLED;
+                return DECSET_BIT_SHOWING_CURSOR;
            case 66:
                return DECSET_BIT_APPLICATION_KEYPAD;
            case 69:
@@ -308,9 +282,9 @@ public final class TerminalEmulator {
        }
    }

-    public TerminalEmulator(TerminalOutput session, int columns, int rows, Integer transcriptRows, TerminalSessionClient client) {
+    public TerminalEmulator(TerminalOutput session, int columns, int rows, int transcriptRows, TerminalSessionClient client) {
        mSession = session;
-        mScreen = mMainBuffer = new TerminalBuffer(columns, getTerminalTranscriptRows(transcriptRows), rows);
+        mScreen = mMainBuffer = new TerminalBuffer(columns, transcriptRows, rows);
        mAltBuffer = new TerminalBuffer(columns, rows, rows);
        mClient = client;
        mRows = rows;
@@ -321,8 +295,6 @@ public final class TerminalEmulator {

    public void updateTerminalSessionClient(TerminalSessionClient client) {
        mClient = client;
-        setCursorStyle();
-        setCursorBlinkState(true);
    }

    public TerminalBuffer getScreen() {
@@ -333,13 +305,6 @@ public final class TerminalEmulator {
        return mScreen == mAltBuffer;
    }

-    private int getTerminalTranscriptRows(Integer transcriptRows) {
-        if (transcriptRows == null || transcriptRows < TERMINAL_TRANSCRIPT_ROWS_MIN || transcriptRows > TERMINAL_TRANSCRIPT_ROWS_MAX)
-            return DEFAULT_TERMINAL_TRANSCRIPT_ROWS;
-        else
-            return transcriptRows;
-    }
-
    /**
     * @param mouseButton one of the MOUSE_* constants of this class.
     */
@@ -407,49 +372,18 @@ public final class TerminalEmulator {
        return mCursorCol;
    }

-    /** Get the terminal cursor style. It will be one of {@link #TERMINAL_CURSOR_STYLES_LIST} */
+    /** {@link #CURSOR_STYLE_BAR}, {@link #CURSOR_STYLE_BLOCK} or {@link #CURSOR_STYLE_UNDERLINE} */
    public int getCursorStyle() {
        return mCursorStyle;
    }

-    /** Set the terminal cursor style. */
-    public void setCursorStyle() {
-        Integer cursorStyle = null;
-
-        if (mClient != null)
-            cursorStyle = mClient.getTerminalCursorStyle();
-
-        if (cursorStyle == null || !Arrays.asList(TERMINAL_CURSOR_STYLES_LIST).contains(cursorStyle))
-            mCursorStyle = DEFAULT_TERMINAL_CURSOR_STYLE;
-        else
-            mCursorStyle = cursorStyle;
-    }
-
    public boolean isReverseVideo() {
        return isDecsetInternalBitSet(DECSET_BIT_REVERSE_VIDEO);
    }

-
-
-    public boolean isCursorEnabled() {
-        return isDecsetInternalBitSet(DECSET_BIT_CURSOR_ENABLED);
+    public boolean isShowingCursor() {
+        return isDecsetInternalBitSet(DECSET_BIT_SHOWING_CURSOR);
    }
-    public boolean shouldCursorBeVisible() {
-        if (!isCursorEnabled())
-            return false;
-        else
-            return mCursorBlinkingEnabled ? mCursorBlinkState : true;
-    }
-
-    public void setCursorBlinkingEnabled(boolean cursorBlinkingEnabled) {
-        this.mCursorBlinkingEnabled = cursorBlinkingEnabled;
-    }
-
-    public void setCursorBlinkState(boolean cursorBlinkState) {
-        this.mCursorBlinkState = cursorBlinkState;
-    }
-
-

    public boolean isKeypadApplicationMode() {
        return isDecsetInternalBitSet(DECSET_BIT_APPLICATION_KEYPAD);
@@ -842,15 +776,15 @@ public final class TerminalEmulator {
                                    case 0: // Blinking block.
                                    case 1: // Blinking block.
                                    case 2: // Steady block.
-                                        mCursorStyle = TERMINAL_CURSOR_STYLE_BLOCK;
+                                        mCursorStyle = CURSOR_STYLE_BLOCK;
                                        break;
                                    case 3: // Blinking underline.
                                    case 4: // Steady underline.
-                                        mCursorStyle = TERMINAL_CURSOR_STYLE_UNDERLINE;
+                                        mCursorStyle = CURSOR_STYLE_UNDERLINE;
                                        break;
                                    case 5: // Blinking bar (xterm addition).
                                    case 6: // Steady bar (xterm addition).
-                                        mCursorStyle = TERMINAL_CURSOR_STYLE_BAR;
+                                        mCursorStyle = CURSOR_STYLE_BAR;
                                        break;
                                }
                                break;
@@ -1120,10 +1054,7 @@ public final class TerminalEmulator {
            case 8: // Auto-repeat Keys (DECARM). Do not implement.
            case 9: // X10 mouse reporting - outdated. Do not implement.
            case 12: // Control cursor blinking - ignore.
-            case 25: // Hide/show cursor - no action needed, renderer will check with shouldCursorBeVisible().
-                if (mClient != null)
-                    mClient.onTerminalCursorStateChange(setting);
-                break;
+            case 25: // Hide/show cursor - no action needed, renderer will check with isShowingCursor().
            case 40: // Allow 80 => 132 Mode, ignore.
            case 45: // TODO: Reverse wrap-around. Implement???
            case 66: // Application keypad (DECNKM).
@@ -1980,7 +1911,7 @@ public final class TerminalEmulator {
                int startIndex = textParameter.indexOf(";") + 1;
                try {
                    String clipboardText = new String(Base64.decode(textParameter.substring(startIndex), 0), StandardCharsets.UTF_8);
-                    mSession.onCopyTextToClipboard(clipboardText);
+                    mSession.clipboardText(clipboardText);
                } catch (Exception e) {
                    mClient.logError(LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");
                }
@@ -2366,7 +2297,7 @@ public final class TerminalEmulator {

    /** Reset terminal state so user can interact with it regardless of present state. */
    public void reset() {
-        setCursorStyle();
+        mCursorStyle = CURSOR_STYLE_BLOCK;
        mArgIndex = 0;
        mContinueSequence = false;
        mEscapeState = ESC_NONE;
@@ -2387,7 +2318,7 @@ public final class TerminalEmulator {
        mCurrentDecSetFlags = 0;
        // Initial wrap-around is not accurate but makes terminal more useful, especially on a small screen:
        setDecsetinternalBit(DECSET_BIT_AUTOWRAP, true);
-        setDecsetinternalBit(DECSET_BIT_CURSOR_ENABLED, true);
+        setDecsetinternalBit(DECSET_BIT_SHOWING_CURSOR, true);
        mSavedDecSetFlags = mSavedStateMain.mSavedDecFlags = mSavedStateAlt.mSavedDecFlags = mCurrentDecSetFlags;

        // XXX: Should we set terminal driver back to IUTF8 with termios?
@@ -18,11 +18,8 @@ public abstract class TerminalOutput {
    /** Notify the terminal client that the terminal title has changed. */
    public abstract void titleChanged(String oldTitle, String newTitle);

-    /** Notify the terminal client that text should be copied to clipboard. */
-    public abstract void onCopyTextToClipboard(String text);
-
-    /** Notify the terminal client that text should be pasted from clipboard. */
-    public abstract void onPasteTextFromClipboard();
+    /** Notify the terminal client that the terminal title has changed. */
+    public abstract void clipboardText(String text);

    /** Notify the terminal client that a bell character (ASCII 7, bell, BEL, \a, ^G)) has been received. */
    public abstract void onBell();
@@ -74,17 +74,14 @@ public final class TerminalSession extends TerminalOutput {
    private final String mCwd;
    private final String[] mArgs;
    private final String[] mEnv;
-    private final Integer mTranscriptRows;
-

    private static final String LOG_TAG = "TerminalSession";

-    public TerminalSession(String shellPath, String cwd, String[] args, String[] env, Integer transcriptRows, TerminalSessionClient client) {
+    public TerminalSession(String shellPath, String cwd, String[] args, String[] env, TerminalSessionClient client) {
        this.mShellPath = shellPath;
        this.mCwd = cwd;
        this.mArgs = args;
        this.mEnv = env;
-        this.mTranscriptRows = transcriptRows;
        this.mClient = client;
    }

@@ -121,7 +118,7 @@ public final class TerminalSession extends TerminalOutput {
     * @param rows    The number of rows in the terminal window.
     */
    public void initializeEmulator(int columns, int rows) {
-        mEmulator = new TerminalEmulator(this, columns, rows, mTranscriptRows, mClient);
+        mEmulator = new TerminalEmulator(this, columns, rows, /* transcript= */2000, mClient);

        int[] processId = new int[1];
        mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns);
@@ -269,13 +266,8 @@ public final class TerminalSession extends TerminalOutput {
    }

    @Override
-    public void onCopyTextToClipboard(String text) {
-        mClient.onCopyTextToClipboard(this, text);
-    }
-
-    @Override
-    public void onPasteTextFromClipboard() {
-        mClient.onPasteTextFromClipboard(this);
+    public void clipboardText(String text) {
+        mClient.onClipboardText(this, text);
    }

    @Override
@@ -13,21 +13,12 @@ public interface TerminalSessionClient {

    void onSessionFinished(TerminalSession finishedSession);

-    void onCopyTextToClipboard(TerminalSession session, String text);
-
-    void onPasteTextFromClipboard(TerminalSession session);
+    void onClipboardText(TerminalSession session, String text);

    void onBell(TerminalSession session);

    void onColorsChanged(TerminalSession session);

-    void onTerminalCursorStateChange(boolean state);
-
-
-
-    Integer getTerminalCursorStyle();
-
-

    void logError(String tag, String message);

@@ -16,23 +16,23 @@ package com.termux.terminal;
 public class DecSetTest extends TerminalTestCase {

 	/** DECSET 25, DECTCEM, controls visibility of the cursor. */
-	public void testEnableDisableCursor() {
+	public void testShowHideCursor() {
 		withTerminalSized(3, 3);
-		assertTrue("Initially the cursor should be enabled", mTerminal.isCursorEnabled());
-		enterString("\033[?25l"); // Disable Cursor (DECTCEM).
-		assertFalse(mTerminal.isCursorEnabled());
-		enterString("\033[?25h"); // Enable Cursor (DECTCEM).
-		assertTrue(mTerminal.isCursorEnabled());
+		assertTrue("Initially the cursor should be visible", mTerminal.isShowingCursor());
+		enterString("\033[?25l"); // Hide Cursor (DECTCEM).
+		assertFalse(mTerminal.isShowingCursor());
+		enterString("\033[?25h"); // Show Cursor (DECTCEM).
+		assertTrue(mTerminal.isShowingCursor());

-		enterString("\033[?25l"); // Disable Cursor (DECTCEM), again.
-		assertFalse(mTerminal.isCursorEnabled());
+		enterString("\033[?25l"); // Hide Cursor (DECTCEM), again.
+		assertFalse(mTerminal.isShowingCursor());
 		mTerminal.reset();
-		assertTrue("Resetting the terminal should enable the cursor", mTerminal.isCursorEnabled());
+		assertTrue("Resetting the terminal should show the cursor", mTerminal.isShowingCursor());

 		enterString("\033[?25l");
-		assertFalse(mTerminal.isCursorEnabled());
-		enterString("\033c"); // RIS resetting should enabled cursor.
-		assertTrue(mTerminal.isCursorEnabled());
+		assertFalse(mTerminal.isShowingCursor());
+		enterString("\033c"); // RIS resetting should reveal cursor.
+		assertTrue(mTerminal.isShowingCursor());
 	}

 	/** DECSET 2004, controls bracketed paste mode. */
@@ -45,21 +45,4 @@ public class ScreenBufferTest extends TerminalTestCase {
 		withTerminalSized(5, 3).enterString("ABC\r\nFG");
 		assertEquals("ABC\nFG", mTerminal.getScreen().getSelectedText(0, 0, 1, 1, true, true));
 	}
-
-	public void testGetWordAtLocation() {
-		withTerminalSized(5, 3).enterString("ABCDEFGHIJ\r\nKLMNO");
-		assertEquals("ABCDEFGHIJKLMNO", mTerminal.getScreen().getWordAtLocation(0, 0));
-		assertEquals("ABCDEFGHIJKLMNO", mTerminal.getScreen().getWordAtLocation(4, 1));
-		assertEquals("ABCDEFGHIJKLMNO", mTerminal.getScreen().getWordAtLocation(4, 2));
-
-		withTerminalSized(5, 3).enterString("ABC DEF GHI ");
-		assertEquals("ABC", mTerminal.getScreen().getWordAtLocation(0, 0));
-		assertEquals("", mTerminal.getScreen().getWordAtLocation(3, 0));
-		assertEquals("DEF", mTerminal.getScreen().getWordAtLocation(4, 0));
-		assertEquals("DEF", mTerminal.getScreen().getWordAtLocation(0, 1));
-		assertEquals("DEF", mTerminal.getScreen().getWordAtLocation(1, 1));
-		assertEquals("GHI", mTerminal.getScreen().getWordAtLocation(0, 2));
-		assertEquals("", mTerminal.getScreen().getWordAtLocation(1, 2));
-		assertEquals("", mTerminal.getScreen().getWordAtLocation(2, 2));
-	}
 }
--- a/Show More
+++ b/Show More